Skip to content

Commit aaa6e93

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

25 files changed

+318
-25
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-2
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)" \
@@ -40,7 +39,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4039
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
4140
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
4241

43-
ENV YARN_VERSION 0.27.5
42+
ENV YARN_VERSION 1.1.0
4443

4544
RUN set -ex \
4645
&& for key in \

‎6.11/alpine/Dockerfile

+1-2
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 \
@@ -46,7 +45,7 @@ RUN addgroup -g 1000 node \
4645
&& rm -Rf "node-v$NODE_VERSION" \
4746
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
4847

49-
ENV YARN_VERSION 0.27.5
48+
ENV YARN_VERSION 1.1.0
5049

5150
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
5251
&& for key in \

‎6.11/slim/Dockerfile

+1-2
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' \
@@ -45,7 +44,7 @@ RUN buildDeps='xz-utils' \
4544
&& apt-get purge -y --auto-remove $buildDeps \
4645
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
4746

48-
ENV YARN_VERSION 0.27.5
47+
ENV YARN_VERSION 1.1.0
4948

5049
RUN set -ex \
5150
&& for key in \

‎6.11/stretch/Dockerfile

+1-2
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)" \
@@ -40,7 +39,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4039
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
4140
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
4241

43-
ENV YARN_VERSION 0.27.5
42+
ENV YARN_VERSION 1.1.0
4443

4544
RUN set -ex \
4645
&& for key in \

‎6.11/wheezy/Dockerfile

+1-2
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)" \
@@ -37,7 +36,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3736
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
3837
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
3938

40-
ENV YARN_VERSION 0.27.5
39+
ENV YARN_VERSION 1.1.0
4140

4241
RUN set -ex \
4342
&& for key in \

‎7.10/alpine/Dockerfile

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
FROM alpine:3.4
2+
3+
ENV NODE_VERSION 7.10.1
4+
5+
RUN addgroup -g 1000 node \
6+
&& adduser -u 1000 -G node -s /bin/sh -D node \
7+
&& apk add --no-cache \
8+
libstdc++ \
9+
&& apk add --no-cache --virtual .build-deps \
10+
binutils-gold \
11+
curl \
12+
g++ \
13+
gcc \
14+
gnupg \
15+
libgcc \
16+
linux-headers \
17+
make \
18+
python \
19+
# gpg keys listed at https://github.com/nodejs/node#release-team
20+
&& for key in \
21+
9554F04D7259F04124DE6B476D5A82AC7E37093B \
22+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
23+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
24+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
25+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
26+
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
27+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
28+
56730D5401028683275BD23C23EFEFE93C4CFFFE \
29+
; do \
30+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
31+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
32+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
33+
done \
34+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.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.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
38+
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
39+
&& cd "node-v$NODE_VERSION" \
40+
&& ./configure \
41+
&& make -j$(getconf _NPROCESSORS_ONLN) \
42+
&& make install \
43+
&& apk del .build-deps \
44+
&& cd .. \
45+
&& rm -Rf "node-v$NODE_VERSION" \
46+
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
47+
48+
ENV YARN_VERSION 1.1.0
49+
50+
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
51+
&& for key in \
52+
6A010C5166006599AA17F08146C2130DFD2497F5 \
53+
; do \
54+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
55+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
56+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
57+
done \
58+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
59+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
60+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
61+
&& mkdir -p /opt/yarn \
62+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
63+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
64+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
65+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
66+
&& apk del .build-deps-yarn
67+
68+
CMD [ "node" ]

‎7.10/stretch/Dockerfile

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
FROM buildpack-deps:stretch
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 7.10.1
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+
*) echo "unsupported architecture"; exit 1 ;; \
32+
esac \
33+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
34+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
35+
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
36+
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
37+
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \
38+
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
39+
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
40+
41+
ENV YARN_VERSION 1.1.0
42+
43+
RUN set -ex \
44+
&& for key in \
45+
6A010C5166006599AA17F08146C2130DFD2497F5 \
46+
; do \
47+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
48+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
49+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
50+
done \
51+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
52+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
53+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
54+
&& mkdir -p /opt/yarn \
55+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
56+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
57+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
58+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
59+
60+
CMD [ "node" ]

‎7.10/wheezy/Dockerfile

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
FROM buildpack-deps:wheezy
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 7.10.1
24+
25+
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
26+
&& case "${dpkgArch##*-}" in \
27+
amd64) ARCH='x64';; \
28+
ppc64el) ARCH='ppc64le';; \
29+
*) echo "unsupported architecture"; exit 1 ;; \
30+
esac \
31+
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
32+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
33+
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
34+
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
35+
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \
36+
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
37+
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
38+
39+
ENV YARN_VERSION 1.1.0
40+
41+
RUN set -ex \
42+
&& for key in \
43+
6A010C5166006599AA17F08146C2130DFD2497F5 \
44+
; do \
45+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
46+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
47+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
48+
done \
49+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
50+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
51+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
52+
&& mkdir -p /opt/yarn \
53+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
54+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
55+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
56+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
57+
58+
CMD [ "node" ]

‎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" ]

0 commit comments

Comments
 (0)