diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index e8ad5463..26327435 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.0.0 +ENV NODE_VERSION 11.1.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.10.1 +ENV YARN_VERSION 1.12.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/11/slim/Dockerfile b/11/slim/Dockerfile index 37ff88f3..f84f2b73 100644 --- a/11/slim/Dockerfile +++ b/11/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 11.0.0 +ENV NODE_VERSION 11.1.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -43,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.10.1 +ENV YARN_VERSION 1.12.1 RUN set -ex \ && for key in \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 3ad8c2c5..1e4a72fd 100644 --- a/11/stretch/Dockerfile +++ b/11/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-team -RUN set -ex \ +ENV NODE_VERSION 11.1.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-team + && set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -19,20 +31,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ - done - -ENV NODE_VERSION 11.0.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.10.1 +ENV YARN_VERSION 1.12.1 RUN set -ex \ && for key in \