From ba86e967dda05b441b51c218edfc50e3a0c564b6 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 3 Oct 2017 11:09:32 -0400 Subject: [PATCH] Revert log level to npm's default level Fixes #528 --- 4.8/Dockerfile | 1 - 4.8/alpine/Dockerfile | 1 - 4.8/slim/Dockerfile | 1 - 4.8/stretch/Dockerfile | 1 - 4.8/wheezy/Dockerfile | 1 - 6.11/Dockerfile | 1 - 6.11/alpine/Dockerfile | 1 - 6.11/slim/Dockerfile | 1 - 6.11/stretch/Dockerfile | 1 - 6.11/wheezy/Dockerfile | 1 - 8.4/Dockerfile | 61 ++++++++++++++++++++++++++++++++++ 8.4/slim/Dockerfile | 66 +++++++++++++++++++++++++++++++++++++ 8.6/Dockerfile | 1 - 8.6/alpine/Dockerfile | 1 - 8.6/slim/Dockerfile | 1 - 8.6/stretch/Dockerfile | 1 - 8.6/wheezy/Dockerfile | 1 - Dockerfile-alpine.template | 1 - Dockerfile-slim.template | 1 - Dockerfile-stretch.template | 1 - Dockerfile-wheezy.template | 1 - Dockerfile.template | 1 - 22 files changed, 127 insertions(+), 20 deletions(-) create mode 100644 8.4/Dockerfile create mode 100644 8.4/slim/Dockerfile diff --git a/4.8/Dockerfile b/4.8/Dockerfile index f9cf8d3487..6cc7438f10 100644 --- a/4.8/Dockerfile +++ b/4.8/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 4.8.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/4.8/alpine/Dockerfile b/4.8/alpine/Dockerfile index bc8753ffb6..514d160a1e 100644 --- a/4.8/alpine/Dockerfile +++ b/4.8/alpine/Dockerfile @@ -1,6 +1,5 @@ FROM alpine:3.4 -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 4.8.4 RUN addgroup -g 1000 node \ diff --git a/4.8/slim/Dockerfile b/4.8/slim/Dockerfile index 01977c2d01..771a61fe4d 100644 --- a/4.8/slim/Dockerfile +++ b/4.8/slim/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 4.8.4 RUN buildDeps='xz-utils' \ diff --git a/4.8/stretch/Dockerfile b/4.8/stretch/Dockerfile index 96db9ab188..cbade1ef26 100644 --- a/4.8/stretch/Dockerfile +++ b/4.8/stretch/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 4.8.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/4.8/wheezy/Dockerfile b/4.8/wheezy/Dockerfile index 9660e6a4e2..dfe43985af 100644 --- a/4.8/wheezy/Dockerfile +++ b/4.8/wheezy/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 4.8.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6.11/Dockerfile b/6.11/Dockerfile index 7cce4e24c8..71bd98a12a 100644 --- a/6.11/Dockerfile +++ b/6.11/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 6.11.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6.11/alpine/Dockerfile b/6.11/alpine/Dockerfile index abcf176785..b45bc16847 100644 --- a/6.11/alpine/Dockerfile +++ b/6.11/alpine/Dockerfile @@ -1,6 +1,5 @@ FROM alpine:3.4 -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 6.11.3 RUN addgroup -g 1000 node \ diff --git a/6.11/slim/Dockerfile b/6.11/slim/Dockerfile index 50d683cdb7..3334bd4ab5 100644 --- a/6.11/slim/Dockerfile +++ b/6.11/slim/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 6.11.3 RUN buildDeps='xz-utils' \ diff --git a/6.11/stretch/Dockerfile b/6.11/stretch/Dockerfile index ac61c008ec..31807f3b99 100644 --- a/6.11/stretch/Dockerfile +++ b/6.11/stretch/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 6.11.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6.11/wheezy/Dockerfile b/6.11/wheezy/Dockerfile index 83ed282cfe..5298c4c5a4 100644 --- a/6.11/wheezy/Dockerfile +++ b/6.11/wheezy/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 6.11.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8.4/Dockerfile b/8.4/Dockerfile new file mode 100644 index 0000000000..2ace27955c --- /dev/null +++ b/8.4/Dockerfile @@ -0,0 +1,61 @@ +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-team +RUN set -ex \ + && for key in \ + 9554F04D7259F04124DE6B476D5A82AC7E37093B \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ + ; do \ + gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + done + +ENV NODE_VERSION 8.4.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';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \ + && 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.1.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/8.4/slim/Dockerfile b/8.4/slim/Dockerfile new file mode 100644 index 0000000000..7bfe368ed5 --- /dev/null +++ b/8.4/slim/Dockerfile @@ -0,0 +1,66 @@ +FROM buildpack-deps:jessie-curl + +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 \ + && for key in \ + 9554F04D7259F04124DE6B476D5A82AC7E37093B \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ + ; do \ + gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + done + +ENV NODE_VERSION 8.4.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -x \ + && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.1.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/8.6/Dockerfile b/8.6/Dockerfile index e5329d6e14..bfe5c6ea5e 100644 --- a/8.6/Dockerfile +++ b/8.6/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 8.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8.6/alpine/Dockerfile b/8.6/alpine/Dockerfile index a13133d39a..4123348287 100644 --- a/8.6/alpine/Dockerfile +++ b/8.6/alpine/Dockerfile @@ -1,6 +1,5 @@ FROM alpine:3.6 -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 8.6.0 RUN addgroup -g 1000 node \ diff --git a/8.6/slim/Dockerfile b/8.6/slim/Dockerfile index fe92b762fc..f04bef8671 100644 --- a/8.6/slim/Dockerfile +++ b/8.6/slim/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 8.6.0 RUN buildDeps='xz-utils' \ diff --git a/8.6/stretch/Dockerfile b/8.6/stretch/Dockerfile index 8b9d667c27..d3d1cbbafd 100644 --- a/8.6/stretch/Dockerfile +++ b/8.6/stretch/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 8.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8.6/wheezy/Dockerfile b/8.6/wheezy/Dockerfile index 8671af8c46..0df1e169f2 100644 --- a/8.6/wheezy/Dockerfile +++ b/8.6/wheezy/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 8.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index cfd6611444..9ae2043bca 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,6 +1,5 @@ FROM alpine:3.4 -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 0.0.0 RUN addgroup -g 1000 node \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index d38d30ecf4..af01aa1339 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 0.0.0 RUN buildDeps='xz-utils' \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 3be1eb9c66..8bbdc62a62 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 0.0.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 4a01bfb866..8e793fd7b7 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 0.0.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/Dockerfile.template b/Dockerfile.template index 572a8f4652..1010e20f7f 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -20,7 +20,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 0.0.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \