Skip to content

Commit ba86e96

Browse files
LaurentGoderreLaurentGoderre
committed
Revert log level to npm's default level
Fixes nodejs#528
1 parent c37d5e8 commit ba86e96

22 files changed

+127
-20
lines changed

‎4.8/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 4.8.4
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎4.8/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM alpine:3.4
22

3-
ENV NPM_CONFIG_LOGLEVEL info
43
ENV NODE_VERSION 4.8.4
54

65
RUN addgroup -g 1000 node \

‎4.8/slim/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 4.8.4
2524

2625
RUN buildDeps='xz-utils' \

‎4.8/stretch/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 4.8.4
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎4.8/wheezy/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 4.8.4
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎6.11/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 6.11.3
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎6.11/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM alpine:3.4
22

3-
ENV NPM_CONFIG_LOGLEVEL info
43
ENV NODE_VERSION 6.11.3
54

65
RUN addgroup -g 1000 node \

‎6.11/slim/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 6.11.3
2524

2625
RUN buildDeps='xz-utils' \

‎6.11/stretch/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 6.11.3
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎6.11/wheezy/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 6.11.3
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎8.4/Dockerfile

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
FROM buildpack-deps:jessie
2+
3+
RUN groupadd --gid 1000 node \
4+
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
5+
6+
# gpg keys listed at https://github.com/nodejs/node#release-team
7+
RUN set -ex \
8+
&& for key in \
9+
9554F04D7259F04124DE6B476D5A82AC7E37093B \
10+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
11+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
12+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
13+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
14+
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
15+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
16+
56730D5401028683275BD23C23EFEFE93C4CFFFE \
17+
; do \
18+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
19+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
21+
done
22+
23+
ENV NODE_VERSION 8.4.0
24+
25+
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
26+
&& case "${dpkgArch##*-}" in \
27+
amd64) ARCH='x64';; \
28+
ppc64el) ARCH='ppc64le';; \
29+
s390x) ARCH='s390x';; \
30+
arm64) ARCH='arm64';; \
31+
armhf) ARCH='armv7l';; \
32+
*) echo "unsupported architecture"; exit 1 ;; \
33+
esac \
34+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
35+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
36+
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
37+
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
38+
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \
39+
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
40+
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
41+
42+
ENV YARN_VERSION 1.1.0
43+
44+
RUN set -ex \
45+
&& for key in \
46+
6A010C5166006599AA17F08146C2130DFD2497F5 \
47+
; do \
48+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
49+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
50+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
51+
done \
52+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
53+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
54+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
55+
&& mkdir -p /opt/yarn \
56+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
57+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
58+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
59+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
60+
61+
CMD [ "node" ]

‎8.4/slim/Dockerfile

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
FROM buildpack-deps:jessie-curl
2+
3+
RUN groupadd --gid 1000 node \
4+
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
5+
6+
# gpg keys listed at https://github.com/nodejs/node#release-team
7+
RUN set -ex \
8+
&& for key in \
9+
9554F04D7259F04124DE6B476D5A82AC7E37093B \
10+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
11+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
12+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
13+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
14+
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
15+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
16+
56730D5401028683275BD23C23EFEFE93C4CFFFE \
17+
; do \
18+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
19+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
21+
done
22+
23+
ENV NODE_VERSION 8.4.0
24+
25+
RUN buildDeps='xz-utils' \
26+
&& ARCH= && dpkgArch="$(dpkg --print-architecture)" \
27+
&& case "${dpkgArch##*-}" in \
28+
amd64) ARCH='x64';; \
29+
ppc64el) ARCH='ppc64le';; \
30+
s390x) ARCH='s390x';; \
31+
arm64) ARCH='arm64';; \
32+
armhf) ARCH='armv7l';; \
33+
*) echo "unsupported architecture"; exit 1 ;; \
34+
esac \
35+
&& set -x \
36+
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
37+
&& rm -rf /var/lib/apt/lists/* \
38+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
39+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
40+
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
41+
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
42+
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \
43+
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
44+
&& apt-get purge -y --auto-remove $buildDeps \
45+
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
46+
47+
ENV YARN_VERSION 1.1.0
48+
49+
RUN set -ex \
50+
&& for key in \
51+
6A010C5166006599AA17F08146C2130DFD2497F5 \
52+
; do \
53+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
54+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
55+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
56+
done \
57+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
58+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
59+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
60+
&& mkdir -p /opt/yarn \
61+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
62+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
63+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
64+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
65+
66+
CMD [ "node" ]

‎8.6/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 8.6.0
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎8.6/alpine/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM alpine:3.6
22

3-
ENV NPM_CONFIG_LOGLEVEL info
43
ENV NODE_VERSION 8.6.0
54

65
RUN addgroup -g 1000 node \

‎8.6/slim/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 8.6.0
2524

2625
RUN buildDeps='xz-utils' \

‎8.6/stretch/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 8.6.0
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎8.6/wheezy/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 8.6.0
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎Dockerfile-alpine.template

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM alpine:3.4
22

3-
ENV NPM_CONFIG_LOGLEVEL info
43
ENV NODE_VERSION 0.0.0
54

65
RUN addgroup -g 1000 node \

‎Dockerfile-slim.template

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 0.0.0
2524

2625
RUN buildDeps='xz-utils' \

‎Dockerfile-stretch.template

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 0.0.0
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎Dockerfile-wheezy.template

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 0.0.0
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

‎Dockerfile.template

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN set -ex \
2020
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

23-
ENV NPM_CONFIG_LOGLEVEL info
2423
ENV NODE_VERSION 0.0.0
2524

2625
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \

0 commit comments

Comments
 (0)