diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 62f762c7b..5b8de8de7 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 8.12.0 +ENV NODE_VERSION 8.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index cf8038ccb..ae8b16ae8 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -3,8 +3,20 @@ FROM buildpack-deps:jessie RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -# gpg keys listed at https://github.com/nodejs/node#release-keys -RUN set -ex \ +ENV NODE_VERSION 8.13.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -19,20 +31,7 @@ RUN set -ex \ 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" || \ gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ - done - -ENV NODE_VERSION 8.12.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + done \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -41,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index ce8907ba3..37fbfc74c 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.12.0-jessie +FROM node:8.13.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 5ac114662..8f3fc75d2 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -1,27 +1,9 @@ -FROM debian:jessie-slim +FROM debian:stretch-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -# gpg keys listed at https://github.com/nodejs/node#release-keys -RUN set -ex \ - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - ; 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" || \ - gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ - done - -ENV NODE_VERSION 8.12.0 +ENV NODE_VERSION 8.13.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -34,9 +16,24 @@ RUN buildDeps='xz-utils' \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && set -x \ - && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ + && set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + ; 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" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -46,7 +43,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 7a55d4dfd..85d7e5a96 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -3,8 +3,20 @@ FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -# gpg keys listed at https://github.com/nodejs/node#release-keys -RUN set -ex \ +ENV NODE_VERSION 8.13.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -19,20 +31,7 @@ RUN set -ex \ 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" || \ gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ - done - -ENV NODE_VERSION 8.12.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + done \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -41,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \