Skip to content

Commit 4d989d8

Browse files
LaurentGoderreLaurentGoderre
authored
Merge branch 'master' into add-contributing
2 parents 1ca17ba + 67c9656 commit 4d989d8

25 files changed

+292
-224
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ env:
1010
matrix :
1111
- NODE_VERSION: '4.8'
1212
- NODE_VERSION: '6.10'
13-
- NODE_VERSION: '7.9'
13+
- NODE_VERSION: '8.0'

‎4.8/Dockerfile‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,39 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
1918
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
19+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

2323
ENV NPM_CONFIG_LOGLEVEL info
24-
ENV NODE_VERSION 4.8.2
24+
ENV NODE_VERSION 4.8.3
2525

2626
RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
27-
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
2828
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
2929
&& grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3030
&& tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
3131
&& rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
3232
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
3333

34-
ENV YARN_VERSION 0.22.0
34+
ENV YARN_VERSION 0.24.4
3535

3636
RUN set -ex \
3737
&& for key in \
3838
6A010C5166006599AA17F08146C2130DFD2497F5 \
3939
; do \
40-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
4140
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
41+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
42+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4343
done \
44-
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
45-
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
46-
&& gpg --batch --verify yarn.js.asc yarn.js \
47-
&& rm yarn.js.asc \
48-
&& mv yarn.js /usr/local/bin/yarn \
49-
&& chmod +x /usr/local/bin/yarn
44+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
45+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
46+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
47+
&& mkdir -p /opt/yarn \
48+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
49+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
50+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
51+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
5052

5153
CMD [ "node" ]

‎4.8/alpine/Dockerfile‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.4
22

33
ENV NPM_CONFIG_LOGLEVEL info
4-
ENV NODE_VERSION 4.8.2
4+
ENV NODE_VERSION 4.8.3
55

66
RUN addgroup -g 1000 node \
77
&& adduser -u 1000 -G node -s /bin/sh -D node \
@@ -28,12 +28,12 @@ RUN addgroup -g 1000 node \
2828
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2929
56730D5401028683275BD23C23EFEFE93C4CFFFE \
3030
; do \
31-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
3231
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
33-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
32+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
33+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
3434
done \
3535
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
36-
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
36+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3737
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
3838
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3939
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
@@ -46,22 +46,24 @@ RUN addgroup -g 1000 node \
4646
&& rm -Rf "node-v$NODE_VERSION" \
4747
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
4848

49-
ENV YARN_VERSION 0.22.0
49+
ENV YARN_VERSION 0.24.4
5050

51-
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
51+
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
5252
&& for key in \
5353
6A010C5166006599AA17F08146C2130DFD2497F5 \
5454
; do \
55-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
5655
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
57-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
56+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
57+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
5858
done \
59-
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
60-
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
61-
&& gpg --batch --verify yarn.js.asc yarn.js \
62-
&& rm yarn.js.asc \
63-
&& mv yarn.js /usr/local/bin/yarn \
64-
&& chmod +x /usr/local/bin/yarn \
59+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
60+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
61+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
62+
&& mkdir -p /opt/yarn \
63+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
64+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
65+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
66+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6567
&& apk del .build-deps-yarn
6668

6769
CMD [ "node" ]

‎4.8/onbuild/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:4.8.2
1+
FROM node:4.8.3
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

‎4.8/slim/Dockerfile‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,44 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
1918
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
19+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

2323
ENV NPM_CONFIG_LOGLEVEL info
24-
ENV NODE_VERSION 4.8.2
24+
ENV NODE_VERSION 4.8.3
2525

2626
RUN buildDeps='xz-utils' \
2727
&& set -x \
2828
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
2929
&& rm -rf /var/lib/apt/lists/* \
3030
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
31-
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
31+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3232
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
3333
&& grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3434
&& tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
3535
&& rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
3636
&& apt-get purge -y --auto-remove $buildDeps \
3737
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
3838

39-
ENV YARN_VERSION 0.22.0
39+
ENV YARN_VERSION 0.24.4
4040

4141
RUN set -ex \
4242
&& for key in \
4343
6A010C5166006599AA17F08146C2130DFD2497F5 \
4444
; do \
45-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
4645
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
47-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
46+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
47+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4848
done \
49-
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
50-
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
51-
&& gpg --batch --verify yarn.js.asc yarn.js \
52-
&& rm yarn.js.asc \
53-
&& mv yarn.js /usr/local/bin/yarn \
54-
&& chmod +x /usr/local/bin/yarn
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
5557

5658
CMD [ "node" ]

‎4.8/wheezy/Dockerfile‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,39 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
1918
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
19+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

2323
ENV NPM_CONFIG_LOGLEVEL info
24-
ENV NODE_VERSION 4.8.2
24+
ENV NODE_VERSION 4.8.3
2525

2626
RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
27-
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
2828
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
2929
&& grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3030
&& tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
3131
&& rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
3232
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
3333

34-
ENV YARN_VERSION 0.22.0
34+
ENV YARN_VERSION 0.24.4
3535

3636
RUN set -ex \
3737
&& for key in \
3838
6A010C5166006599AA17F08146C2130DFD2497F5 \
3939
; do \
40-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
4140
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
41+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
42+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4343
done \
44-
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
45-
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
46-
&& gpg --batch --verify yarn.js.asc yarn.js \
47-
&& rm yarn.js.asc \
48-
&& mv yarn.js /usr/local/bin/yarn \
49-
&& chmod +x /usr/local/bin/yarn
44+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
45+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
46+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
47+
&& mkdir -p /opt/yarn \
48+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
49+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
50+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
51+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
5052

5153
CMD [ "node" ]

‎6.10/Dockerfile‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,39 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
1918
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
19+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
2121
done
2222

2323
ENV NPM_CONFIG_LOGLEVEL info
24-
ENV NODE_VERSION 6.10.2
24+
ENV NODE_VERSION 6.10.3
2525

2626
RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
27-
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
2828
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
2929
&& grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3030
&& tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
3131
&& rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
3232
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
3333

34-
ENV YARN_VERSION 0.22.0
34+
ENV YARN_VERSION 0.24.4
3535

3636
RUN set -ex \
3737
&& for key in \
3838
6A010C5166006599AA17F08146C2130DFD2497F5 \
3939
; do \
40-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
4140
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
41+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
42+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4343
done \
44-
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
45-
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
46-
&& gpg --batch --verify yarn.js.asc yarn.js \
47-
&& rm yarn.js.asc \
48-
&& mv yarn.js /usr/local/bin/yarn \
49-
&& chmod +x /usr/local/bin/yarn
44+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
45+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
46+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
47+
&& mkdir -p /opt/yarn \
48+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
49+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
50+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
51+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
5052

5153
CMD [ "node" ]

‎6.10/alpine/Dockerfile‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.4
22

33
ENV NPM_CONFIG_LOGLEVEL info
4-
ENV NODE_VERSION 6.10.2
4+
ENV NODE_VERSION 6.10.3
55

66
RUN addgroup -g 1000 node \
77
&& adduser -u 1000 -G node -s /bin/sh -D node \
@@ -28,12 +28,12 @@ RUN addgroup -g 1000 node \
2828
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2929
56730D5401028683275BD23C23EFEFE93C4CFFFE \
3030
; do \
31-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
3231
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
33-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
32+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
33+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
3434
done \
3535
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
36-
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
36+
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3737
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
3838
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3939
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
@@ -46,22 +46,24 @@ RUN addgroup -g 1000 node \
4646
&& rm -Rf "node-v$NODE_VERSION" \
4747
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
4848

49-
ENV YARN_VERSION 0.22.0
49+
ENV YARN_VERSION 0.24.4
5050

51-
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
51+
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
5252
&& for key in \
5353
6A010C5166006599AA17F08146C2130DFD2497F5 \
5454
; do \
55-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
5655
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
57-
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
56+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
57+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
5858
done \
59-
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
60-
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
61-
&& gpg --batch --verify yarn.js.asc yarn.js \
62-
&& rm yarn.js.asc \
63-
&& mv yarn.js /usr/local/bin/yarn \
64-
&& chmod +x /usr/local/bin/yarn \
59+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
60+
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
61+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
62+
&& mkdir -p /opt/yarn \
63+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
64+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
65+
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
66+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6567
&& apk del .build-deps-yarn
6668

6769
CMD [ "node" ]

‎6.10/onbuild/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:6.10.2
1+
FROM node:6.10.3
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

0 commit comments

Comments
 (0)