Skip to content

Commit f31613d

Browse files
PeterDaveHelloPeterDaveHello
authored
Merge pull request #647 from nodejs/update-yarn-dir
Update yarn w/ symbolic-linked directory
2 parents 0ca768b + ae26d21 commit f31613d

File tree

20 files changed

+40
-20
lines changed

20 files changed

+40
-20
lines changed

‎4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ RUN set -ex \
5454
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
5555
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
5656
&& mkdir -p /opt/yarn \
57-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
57+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
5859
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
5960
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6061
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

‎4/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
5959
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
6060
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6161
&& mkdir -p /opt/yarn \
62-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
62+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
6364
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
6465
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6566
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \

‎4/slim/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ RUN set -ex \
5959
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
6060
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6161
&& mkdir -p /opt/yarn \
62-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
62+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
6364
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
6465
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6566
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

‎4/stretch/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ RUN set -ex \
5454
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
5555
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
5656
&& mkdir -p /opt/yarn \
57-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
57+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
5859
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
5960
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6061
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

‎4/wheezy/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ RUN set -ex \
5050
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
5151
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
5252
&& mkdir -p /opt/yarn \
53-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
53+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
54+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
5455
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
5556
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
5657
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

‎6/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ RUN set -ex \
5454
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
5555
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
5656
&& mkdir -p /opt/yarn \
57-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
57+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
5859
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
5960
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6061
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

‎6/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
5959
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
6060
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6161
&& mkdir -p /opt/yarn \
62-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
62+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
6364
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
6465
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6566
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \

‎6/slim/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ RUN set -ex \
5959
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
6060
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6161
&& mkdir -p /opt/yarn \
62-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
62+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
6364
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
6465
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6566
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

‎6/stretch/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ RUN set -ex \
5454
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
5555
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
5656
&& mkdir -p /opt/yarn \
57-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
57+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
5859
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
5960
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
6061
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

‎6/wheezy/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ RUN set -ex \
5050
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
5151
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
5252
&& mkdir -p /opt/yarn \
53-
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
53+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
54+
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
5455
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
5556
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
5657
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

0 commit comments

Comments
 (0)