diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..155ef3165 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,48 @@ +name: GitHub CI + +on: + pull_request: + push: + schedule: + - cron: 0 0 * * 0 + +defaults: + run: + shell: 'bash -Eeuo pipefail -x {0}' + +jobs: + + generate-jobs: + name: Generate Jobs + runs-on: ubuntu-latest + outputs: + strategy: ${{ steps.generate-jobs.outputs.strategy }} + steps: + - uses: actions/checkout@v1 + - id: generate-jobs + name: Generate Jobs + run: | + git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew + strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + jq . <<<"$strategy" # sanity check / debugging aid + echo "::set-output name=strategy::$strategy" + + test: + needs: generate-jobs + strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }} + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v1 + - name: Prepare Environment + run: ${{ matrix.runs.prepare }} + - name: Pull Dependencies + run: ${{ matrix.runs.pull }} + - name: Build ${{ matrix.name }} + run: ${{ matrix.runs.build }} + - name: History ${{ matrix.name }} + run: ${{ matrix.runs.history }} + - name: Test ${{ matrix.name }} + run: ${{ matrix.runs.test }} + - name: '"docker images"' + run: ${{ matrix.runs.images }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2d835907a..000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: bash -services: docker - -env: - - VERSION=19.03-rc - - VERSION=19.03 - -install: - - git clone https://github.com/docker-library/official-images.git ~/official-images - -before_script: - - env | sort - - cd "$VERSION" - - image="docker:$VERSION" - -script: - - travis_retry docker build -t "$image" . - - ~/official-images/test/run.sh "$image" - - travis_retry docker build -t "$image-dind" dind - - ~/official-images/test/run.sh "$image-dind" - - travis_retry docker build -t "$image-git" git - - ~/official-images/test/run.sh "$image-git" - -after_script: - - docker images - -# vim:set et ts=2 sw=2: diff --git a/README.md b/README.md index bfd2d4ab4..32bf88efe 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,12 @@ For outstanding `docker` image PRs, check [PRs with the "library/docker" label o --- -- [![build status badge](https://img.shields.io/travis/docker-library/docker/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/docker/branches) -- [![build status badge](https://img.shields.io/appveyor/ci/docker-library/docker/master.svg?label=AppVeyor)](https://ci.appveyor.com/project/docker-library/docker) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/docker.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/docker) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/docker/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) +- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/docker.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/docker/) | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| -| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker) | -| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker/) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker/) | +| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker/) | diff --git a/update.sh b/update.sh index 756d6bc43..a63ed8802 100755 --- a/update.sh +++ b/update.sh @@ -63,8 +63,6 @@ dockerVersions="$( ' )" -travisEnv= -appveyorEnv= for version in "${versions[@]}"; do rcVersion="${version%-rc}" @@ -136,27 +134,8 @@ for version in "${versions[@]}"; do if [ "$majorVersion" -lt 18 ] || { [ "$majorVersion" -eq 18 ] && [ "$minorVersion" -lt 2 ]; }; then sed -ri '/pigz/d' "$df" fi - - if [[ "$variant" == windows/* ]]; then - winVariant="$(basename "$variant")" - - case "$winVariant" in - *-1709) ;; # no AppVeyor support for 1709 yet: https://github.com/appveyor/ci/issues/1885 - *) appveyorEnv='\n - version: '"$version"'\n variant: '"$winVariant$appveyorEnv" ;; - esac - fi done cp -a docker-entrypoint.sh modprobe.sh "$version/" cp -a dockerd-entrypoint.sh "$version/dind/" - - travisEnv='\n - VERSION='"$version$travisEnv" done - -travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)" -echo "$travis" > .travis.yml - -if [ -f .appveyor.yml ]; then - appveyor="$(awk -v 'RS=\n\n' '$1 == "environment:" { $0 = "environment:\n matrix:'"$appveyorEnv"'" } { printf "%s%s", $0, RS }' .appveyor.yml)" - echo "$appveyor" > .appveyor.yml -fi