diff --git a/.github/workflows/10-alpine3.10.yml b/.github/workflows/10-alpine3.10.yml new file mode 100644 index 0000000000..dcbc2e6f16 --- /dev/null +++ b/.github/workflows/10-alpine3.10.yml @@ -0,0 +1,24 @@ +name: 10 on alpine3.10 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.10/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.10/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 alpine3.10 diff --git a/.github/workflows/10-alpine3.11.yml b/.github/workflows/10-alpine3.11.yml new file mode 100644 index 0000000000..b29555199c --- /dev/null +++ b/.github/workflows/10-alpine3.11.yml @@ -0,0 +1,24 @@ +name: 10 on alpine3.11 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.11/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.11/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 alpine3.11 diff --git a/.github/workflows/10-alpine3.9.yml b/.github/workflows/10-alpine3.9.yml new file mode 100644 index 0000000000..fd702bc6bf --- /dev/null +++ b/.github/workflows/10-alpine3.9.yml @@ -0,0 +1,24 @@ +name: 10 on alpine3.9 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.9/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.9/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 alpine3.9 diff --git a/.github/workflows/10-buster-slim.yml b/.github/workflows/10-buster-slim.yml new file mode 100644 index 0000000000..62e8e71f7b --- /dev/null +++ b/.github/workflows/10-buster-slim.yml @@ -0,0 +1,24 @@ +name: 10 on buster-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster-slim/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 buster-slim diff --git a/.github/workflows/10-buster.yml b/.github/workflows/10-buster.yml new file mode 100644 index 0000000000..0b91baa263 --- /dev/null +++ b/.github/workflows/10-buster.yml @@ -0,0 +1,24 @@ +name: 10 on buster + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 buster diff --git a/.github/workflows/10-stretch-slim.yml b/.github/workflows/10-stretch-slim.yml new file mode 100644 index 0000000000..7ecd2c3b86 --- /dev/null +++ b/.github/workflows/10-stretch-slim.yml @@ -0,0 +1,24 @@ +name: 10 on stretch-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch-slim/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 stretch-slim diff --git a/.github/workflows/10-stretch.yml b/.github/workflows/10-stretch.yml new file mode 100644 index 0000000000..429797f98e --- /dev/null +++ b/.github/workflows/10-stretch.yml @@ -0,0 +1,24 @@ +name: 10 on stretch + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 stretch diff --git a/.github/workflows/12-alpine3.10.yml b/.github/workflows/12-alpine3.10.yml new file mode 100644 index 0000000000..a65b7b8e02 --- /dev/null +++ b/.github/workflows/12-alpine3.10.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.10 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.10/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.10/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.10 diff --git a/.github/workflows/12-alpine3.11.yml b/.github/workflows/12-alpine3.11.yml new file mode 100644 index 0000000000..0180b3cae9 --- /dev/null +++ b/.github/workflows/12-alpine3.11.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.11 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.11/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.11/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.11 diff --git a/.github/workflows/12-alpine3.12.yml b/.github/workflows/12-alpine3.12.yml new file mode 100644 index 0000000000..3a45b2b963 --- /dev/null +++ b/.github/workflows/12-alpine3.12.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.12 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.12/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.12/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.12 diff --git a/.github/workflows/12-alpine3.9.yml b/.github/workflows/12-alpine3.9.yml new file mode 100644 index 0000000000..a194582d84 --- /dev/null +++ b/.github/workflows/12-alpine3.9.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.9 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.9/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.9/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.9 diff --git a/.github/workflows/12-buster-slim.yml b/.github/workflows/12-buster-slim.yml new file mode 100644 index 0000000000..50c56bdbcf --- /dev/null +++ b/.github/workflows/12-buster-slim.yml @@ -0,0 +1,24 @@ +name: 12 on buster-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster-slim/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 buster-slim diff --git a/.github/workflows/12-buster.yml b/.github/workflows/12-buster.yml new file mode 100644 index 0000000000..b5c81a7300 --- /dev/null +++ b/.github/workflows/12-buster.yml @@ -0,0 +1,24 @@ +name: 12 on buster + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 buster diff --git a/.github/workflows/12-stretch-slim.yml b/.github/workflows/12-stretch-slim.yml new file mode 100644 index 0000000000..63cbfe919b --- /dev/null +++ b/.github/workflows/12-stretch-slim.yml @@ -0,0 +1,24 @@ +name: 12 on stretch-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch-slim/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 stretch-slim diff --git a/.github/workflows/12-stretch.yml b/.github/workflows/12-stretch.yml new file mode 100644 index 0000000000..76c7f8a570 --- /dev/null +++ b/.github/workflows/12-stretch.yml @@ -0,0 +1,24 @@ +name: 12 on stretch + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 stretch diff --git a/.github/workflows/14-alpine3.10.yml b/.github/workflows/14-alpine3.10.yml new file mode 100644 index 0000000000..3b70625299 --- /dev/null +++ b/.github/workflows/14-alpine3.10.yml @@ -0,0 +1,24 @@ +name: 14 on alpine3.10 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.10/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.10/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 alpine3.10 diff --git a/.github/workflows/14-alpine3.11.yml b/.github/workflows/14-alpine3.11.yml new file mode 100644 index 0000000000..f968084094 --- /dev/null +++ b/.github/workflows/14-alpine3.11.yml @@ -0,0 +1,24 @@ +name: 14 on alpine3.11 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.11/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.11/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 alpine3.11 diff --git a/.github/workflows/14-alpine3.12.yml b/.github/workflows/14-alpine3.12.yml new file mode 100644 index 0000000000..f5ec5d12ca --- /dev/null +++ b/.github/workflows/14-alpine3.12.yml @@ -0,0 +1,24 @@ +name: 14 on alpine3.12 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.12/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.12/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 alpine3.12 diff --git a/.github/workflows/14-buster-slim.yml b/.github/workflows/14-buster-slim.yml new file mode 100644 index 0000000000..6d4473db90 --- /dev/null +++ b/.github/workflows/14-buster-slim.yml @@ -0,0 +1,24 @@ +name: 14 on buster-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster-slim/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 buster-slim diff --git a/.github/workflows/14-buster.yml b/.github/workflows/14-buster.yml new file mode 100644 index 0000000000..9ab90319b0 --- /dev/null +++ b/.github/workflows/14-buster.yml @@ -0,0 +1,24 @@ +name: 14 on buster + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 buster diff --git a/.github/workflows/14-stretch-slim.yml b/.github/workflows/14-stretch-slim.yml new file mode 100644 index 0000000000..f92ba8d13f --- /dev/null +++ b/.github/workflows/14-stretch-slim.yml @@ -0,0 +1,24 @@ +name: 14 on stretch-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch-slim/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 stretch-slim diff --git a/.github/workflows/14-stretch.yml b/.github/workflows/14-stretch.yml new file mode 100644 index 0000000000..edba2d3afe --- /dev/null +++ b/.github/workflows/14-stretch.yml @@ -0,0 +1,24 @@ +name: 14 on stretch + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch/Dockerfile + +jobs: + build: + name: test build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 stretch diff --git a/.github/workflows/dockerfiles.yml b/.github/workflows/dockerfiles.yml new file mode 100644 index 0000000000..a9da1ab7ec --- /dev/null +++ b/.github/workflows/dockerfiles.yml @@ -0,0 +1,11 @@ +name: Check for out of sync YAML pipeline files + +on: [pull_request] + +jobs: + regen: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: ./update.sh -t + - run: git diff --color --exit-code diff --git a/.travis.yml b/.travis.yml index 83ca542b9d..69242a0f62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,48 +6,12 @@ dist: xenial language: minimal -services: - - docker - -.before_script: &auto_skip -- | - if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then - TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" - fi - if [ "default" = "$VARIANT" ]; then - Dockerfile="$NODE_VERSION/Dockerfile" - else - Dockerfile="$NODE_VERSION/$VARIANT/Dockerfile" - fi - if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then - echo "This is a new branch" - elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then - echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile$"; then - echo "Change of $Dockerfile detected." - else - echo "Skip build of $Dockerfile as it's not changed." - exit - fi - -script: ./test-build.sh $NODE_VERSION $VARIANT - stages: - - Test - - Build - name: Deploy if: branch = master AND type IN (push) jobs: - fast_finish: true - include: - - stage: Test - name: .travis.yml and travis.yml.template consistency - script: - - ./update.sh -t - - git diff --stat --exit-code .travis.yml - - stage: Deploy before_script: - | @@ -64,159 +28,3 @@ jobs: fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" - - # Docker Build # - - - stage: Build - before_script: *auto_skip - name: 10 on stretch - env: - - NODE_VERSION="10" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 10 on stretch-slim - env: - - NODE_VERSION="10" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 10 on buster - env: - - NODE_VERSION="10" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 10 on buster-slim - env: - - NODE_VERSION="10" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 10 on alpine3.9 - env: - - NODE_VERSION="10" - - VARIANT="alpine3.9" - - - stage: Build - before_script: *auto_skip - name: 10 on alpine3.10 - env: - - NODE_VERSION="10" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 10 on alpine3.11 - env: - - NODE_VERSION="10" - - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: 12 on stretch - env: - - NODE_VERSION="12" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 12 on stretch-slim - env: - - NODE_VERSION="12" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 12 on buster - env: - - NODE_VERSION="12" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 12 on buster-slim - env: - - NODE_VERSION="12" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.9 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.9" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.10 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.11 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.12 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.12" - - - stage: Build - before_script: *auto_skip - name: 14 on stretch - env: - - NODE_VERSION="14" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 14 on stretch-slim - env: - - NODE_VERSION="14" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 14 on buster - env: - - NODE_VERSION="14" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 14 on buster-slim - env: - - NODE_VERSION="14" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 14 on alpine3.10 - env: - - NODE_VERSION="14" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 14 on alpine3.11 - env: - - NODE_VERSION="14" - - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: 14 on alpine3.12 - env: - - NODE_VERSION="14" - - VARIANT="alpine3.12" diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 7ee7a3bd41..02dc33c23d 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ + CHECKSUM="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,16 @@ RUN addgroup -g 1000 node \ python \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 4825469c8e..cd6555a035 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ + CHECKSUM="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,16 @@ RUN addgroup -g 1000 node \ python \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index d55ff21e4e..f9386040b7 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ + CHECKSUM="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,16 @@ RUN addgroup -g 1000 node \ python \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 16c01201ca..3dfe42dedd 100644 --- a/10/buster-slim/Dockerfile +++ b/10/buster-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:buster-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,16 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 838ba21f1a..8ac9c75e4b 100644 --- a/10/buster/Dockerfile +++ b/10/buster/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:buster RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -18,18 +18,16 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index ba8690eff5..1a1d2036ae 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/stretch-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:stretch-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,16 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 4999081c85..53d43a2129 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -18,18 +18,16 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 38d63ee950..cd2620eee0 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index ffb04675c2..5e79ebe1d0 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 053935b5a4..65eb5db0a2 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index dce084d1d4..4ef5645957 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index bf17ae28c7..875f046f71 100644 --- a/12/buster-slim/Dockerfile +++ b/12/buster-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:buster-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 339a8183a6..f9b2577709 100644 --- a/12/buster/Dockerfile +++ b/12/buster/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:buster RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index ec32edc9c4..66a3e6659d 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/stretch-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:stretch-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 8475f9e40a..2101a316a5 100644 --- a/12/stretch/Dockerfile +++ b/12/stretch/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index c86b5c4094..ecfca31a42 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ + CHECKSUM="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 77886ec83f..fa72e9d520 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ + CHECKSUM="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index cc29702a6f..22bdc75d23 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ + CHECKSUM="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 0f8b77e2de..8d4117803e 100644 --- a/14/buster-slim/Dockerfile +++ b/14/buster-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:buster-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 010e83b773..ce18647d01 100644 --- a/14/buster/Dockerfile +++ b/14/buster/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:buster RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 47a9abfbc7..7fd5a7b6f5 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/stretch-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:stretch-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 6e76691ed6..5102745e41 100644 --- a/14/stretch/Dockerfile +++ b/14/stretch/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ diff --git a/test-image.bats b/test-image.bats index 0ed164867c..b424b95a4e 100755 --- a/test-image.bats +++ b/test-image.bats @@ -1,17 +1,17 @@ #!/usr/bin/env bats @test "Test for node and version" { - run docker run --rm -it node:"$full_tag" node -e "process.stdout.write(process.versions.node)" + run docker run --rm node:"$full_tag" node -e "process.stdout.write(process.versions.node)" [ "$status" -eq 0 ] [ "$output" == "${full_version}" ] } @test "Test for npm" { - run docker run --rm -it node:"$full_tag" npm --version + run docker run --rm node:"$full_tag" npm --version [ "$status" -eq 0 ] } @test "Test for yarn" { - run docker run --rm -it node:"$full_tag" yarn --version + run docker run --rm node:"$full_tag" yarn --version [ "$status" -eq 0 ] } diff --git a/travis.yml.template b/travis.yml.template index 0aa5a08dc2..346b2b81fc 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -4,35 +4,8 @@ dist: xenial language: minimal -services: - - docker - -.before_script: &auto_skip -- | - if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then - TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" - fi - if [ "default" = "$VARIANT" ]; then - Dockerfile="$NODE_VERSION/Dockerfile" - else - Dockerfile="$NODE_VERSION/$VARIANT/Dockerfile" - fi - if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then - echo "This is a new branch" - elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then - echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile$"; then - echo "Change of $Dockerfile detected." - else - echo "Skip build of $Dockerfile as it's not changed." - exit - fi - -script: ./test-build.sh $NODE_VERSION $VARIANT - stages: - Test - - Build - name: Deploy if: branch = master AND type IN (push) @@ -62,5 +35,3 @@ jobs: fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" - - # Docker Build # diff --git a/update.sh b/update.sh index 87f1c863a6..8b66a6e55e 100755 --- a/update.sh +++ b/update.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ue function usage() { @@ -17,26 +18,26 @@ function usage() { - update.sh 8 buster-slim,buster # Update only buster's slim and buster variants for version 8 - update.sh -s 8 stretch # Update only stretch variant for version 8, skip updating Alpine and Yarn - update.sh . alpine # Update the alpine variant for all versions - - update.sh -t # Update .travis.yml only + - update.sh -b # Update CI files only OPTIONS: -s Security update; skip updating the yarn and alpine versions. - -t Travis CI config update only + -b CI config update only -h Show this message EOF } SKIP=false -TRAVIS_CI_ONLY=false -while getopts "sth" opt; do +CI_ONLY=false +while getopts "sbh" opt; do case "${opt}" in s) SKIP=true shift ;; - t) - TRAVIS_CI_ONLY=true + b) + CI_ONLY=true shift ;; h) @@ -195,25 +196,39 @@ function add_stage() { local variant=${1} shift - echo ' - - stage: Build - before_script: *auto_skip - name: '"${version}"' on '"${variant}"' - env: - - NODE_VERSION="'"${version}"'" - - VARIANT="'"${variant}"'"' >> .travis.yml + echo "name: ${version} on ${variant} + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - ${version}/${variant}/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - ${version}/${variant}/Dockerfile + +jobs: + build: + name: ${version} on ${variant} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh ${version} ${variant}" > ".github/workflows/${version}-${variant}.yml" } -echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # -' | cat - travis.yml.template > .travis.yml - for version in "${versions[@]}"; do parentpath=$(dirname "${version}") versionnum=$(basename "${version}") baseuri=$(get_config "${parentpath}" "baseuri") update_version=$(in_versions_to_update "${version}") - [ "${update_version}" -eq 0 ] && [ true != "$TRAVIS_CI_ONLY" ] && info "Updating version ${version}..." + [ "${update_version}" -eq 0 ] && [ true != "$CI_ONLY" ] && info "Updating version ${version}..." # Get supported variants according the target architecture # See details in function.sh @@ -221,7 +236,7 @@ for version in "${versions[@]}"; do if [ -f "${version}/Dockerfile" ]; then add_stage "${baseuri}" "${version}" "default" - [ true = "$TRAVIS_CI_ONLY" ] && continue + [ true = "$CI_ONLY" ] && continue if [ "${update_version}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & @@ -232,7 +247,7 @@ for version in "${versions[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue add_stage "${baseuri}" "${version}" "${variant}" - [ true = "$TRAVIS_CI_ONLY" ] && continue + [ true = "$CI_ONLY" ] && continue update_variant=$(in_variants_to_update "${variant}") template_file="${parentpath}/Dockerfile-${variant}.template"