Skip to content

Commit 1b7702b

Browse files
committed
Change Yarn installation method. Tarball is used now.
1 parent cad9906 commit 1b7702b

File tree

4 files changed

+33
-25
lines changed

4 files changed

+33
-25
lines changed

Dockerfile-alpine.template

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,22 @@ RUN addgroup -g 1000 node \
4848

4949
ENV YARN_VERSION 0.0.0
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 \
5555
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
5656
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
5757
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
5858
done \
59-
&& curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
60-
&& curl -fSL --compressed -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" ]

Dockerfile-slim.template

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ RUN set -ex \
4646
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
4747
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4848
done \
49-
&& curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
50-
&& curl -fSL --compressed -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" ]

Dockerfile-wheezy.template

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ RUN set -ex \
4141
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
4242
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4343
done \
44-
&& curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
45-
&& curl -fSL --compressed -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" ]

Dockerfile.template

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ RUN set -ex \
4141
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
4242
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4343
done \
44-
&& curl -fSL --compressed -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
45-
&& curl -fSL --compressed -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" ]

0 commit comments

Comments
 (0)