Skip to content

Commit ab12e9b

Browse files
cectonSimenB
cecton
authored and
SimenB
committed
Fixed symbolic links to yarn and yarnpkg (#650)
* Fixed symbolic links to yarn and yarnpkg * Ensures npm and yarn can be run properly
1 parent f31613d commit ab12e9b

26 files changed

+87
-102
lines changed

‎4/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ RUN set -ex \
5353
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
56-
&& mkdir -p /opt/yarn \
56+
&& mkdir -p /opt \
5757
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
59-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
60-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
58+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
59+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6160
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
6261

6362
CMD [ "node" ]

‎4/alpine/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
5858
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
61-
&& mkdir -p /opt/yarn \
61+
&& mkdir -p /opt \
6262
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
64-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
65-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
63+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
64+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6665
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6766
&& apk del .build-deps-yarn
6867

‎4/slim/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ RUN set -ex \
5858
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
61-
&& mkdir -p /opt/yarn \
61+
&& mkdir -p /opt \
6262
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
64-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
65-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
63+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
64+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6665
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
6766

6867
CMD [ "node" ]

‎4/stretch/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ RUN set -ex \
5353
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
56-
&& mkdir -p /opt/yarn \
56+
&& mkdir -p /opt \
5757
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
59-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
60-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
58+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
59+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6160
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
6261

6362
CMD [ "node" ]

‎4/wheezy/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ RUN set -ex \
4949
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
52-
&& mkdir -p /opt/yarn \
52+
&& mkdir -p /opt \
5353
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
54-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
55-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
56-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
54+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
55+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
5756
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
5857

5958
CMD [ "node" ]

‎6/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ RUN set -ex \
5353
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
56-
&& mkdir -p /opt/yarn \
56+
&& mkdir -p /opt \
5757
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
59-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
60-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
58+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
59+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6160
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
6261

6362
CMD [ "node" ]

‎6/alpine/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
5858
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
61-
&& mkdir -p /opt/yarn \
61+
&& mkdir -p /opt \
6262
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
64-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
65-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
63+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
64+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6665
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6766
&& apk del .build-deps-yarn
6867

‎6/slim/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ RUN set -ex \
5858
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
61-
&& mkdir -p /opt/yarn \
61+
&& mkdir -p /opt \
6262
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
63-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
64-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
65-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
63+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
64+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6665
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
6766

6867
CMD [ "node" ]

‎6/stretch/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ RUN set -ex \
5353
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
56-
&& mkdir -p /opt/yarn \
56+
&& mkdir -p /opt \
5757
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
58-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
59-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
60-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
58+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
59+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6160
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
6261

6362
CMD [ "node" ]

‎6/wheezy/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ RUN set -ex \
4949
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
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 \
52-
&& mkdir -p /opt/yarn \
52+
&& mkdir -p /opt \
5353
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
54-
&& ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \
55-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
56-
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
54+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
55+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
5756
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
5857

5958
CMD [ "node" ]

0 commit comments

Comments
 (0)