Skip to content

Commit bf5170c

Browse files
peshopesho
authored
Merge pull request #342 from pesho/yarn_fix
Build stability improvements (curl & gpg)
2 parents f9d32ba + debf4ea commit bf5170c

File tree

16 files changed

+48
-48
lines changed

16 files changed

+48
-48
lines changed

‎4.8/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex \
3838
; do \
3939
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4040
done \
41-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43-
&& gpg --verify yarn.js.asc yarn.js \
41+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43+
&& gpg --batch --verify yarn.js.asc yarn.js \
4444
&& rm yarn.js.asc \
4545
&& mv yarn.js /usr/local/bin/yarn \
4646
&& chmod +x /usr/local/bin/yarn

‎4.8/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
5151
; do \
5252
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5353
done \
54-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
55-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
56-
&& gpg --verify yarn.js.asc yarn.js \
54+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
55+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
56+
&& gpg --batch --verify yarn.js.asc yarn.js \
5757
&& rm yarn.js.asc \
5858
&& mv yarn.js /usr/local/bin/yarn \
5959
&& chmod +x /usr/local/bin/yarn \

‎4.8/slim/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ RUN set -ex \
4343
; do \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
done \
46-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
47-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
48-
&& gpg --verify yarn.js.asc yarn.js \
46+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
47+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
48+
&& gpg --batch --verify yarn.js.asc yarn.js \
4949
&& rm yarn.js.asc \
5050
&& mv yarn.js /usr/local/bin/yarn \
5151
&& chmod +x /usr/local/bin/yarn

‎4.8/wheezy/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex \
3838
; do \
3939
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4040
done \
41-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43-
&& gpg --verify yarn.js.asc yarn.js \
41+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43+
&& gpg --batch --verify yarn.js.asc yarn.js \
4444
&& rm yarn.js.asc \
4545
&& mv yarn.js /usr/local/bin/yarn \
4646
&& chmod +x /usr/local/bin/yarn

‎6.10/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex \
3838
; do \
3939
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4040
done \
41-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43-
&& gpg --verify yarn.js.asc yarn.js \
41+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43+
&& gpg --batch --verify yarn.js.asc yarn.js \
4444
&& rm yarn.js.asc \
4545
&& mv yarn.js /usr/local/bin/yarn \
4646
&& chmod +x /usr/local/bin/yarn

‎6.10/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
5151
; do \
5252
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5353
done \
54-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
55-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
56-
&& gpg --verify yarn.js.asc yarn.js \
54+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
55+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
56+
&& gpg --batch --verify yarn.js.asc yarn.js \
5757
&& rm yarn.js.asc \
5858
&& mv yarn.js /usr/local/bin/yarn \
5959
&& chmod +x /usr/local/bin/yarn \

‎6.10/slim/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ RUN set -ex \
4343
; do \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
done \
46-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
47-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
48-
&& gpg --verify yarn.js.asc yarn.js \
46+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
47+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
48+
&& gpg --batch --verify yarn.js.asc yarn.js \
4949
&& rm yarn.js.asc \
5050
&& mv yarn.js /usr/local/bin/yarn \
5151
&& chmod +x /usr/local/bin/yarn

‎6.10/wheezy/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex \
3838
; do \
3939
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4040
done \
41-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43-
&& gpg --verify yarn.js.asc yarn.js \
41+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43+
&& gpg --batch --verify yarn.js.asc yarn.js \
4444
&& rm yarn.js.asc \
4545
&& mv yarn.js /usr/local/bin/yarn \
4646
&& chmod +x /usr/local/bin/yarn

‎7.6/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex \
3838
; do \
3939
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4040
done \
41-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43-
&& gpg --verify yarn.js.asc yarn.js \
41+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
42+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
43+
&& gpg --batch --verify yarn.js.asc yarn.js \
4444
&& rm yarn.js.asc \
4545
&& mv yarn.js /usr/local/bin/yarn \
4646
&& chmod +x /usr/local/bin/yarn

‎7.6/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
5151
; do \
5252
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5353
done \
54-
&& curl -SL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
55-
&& curl -SL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
56-
&& gpg --verify yarn.js.asc yarn.js \
54+
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
55+
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \
56+
&& gpg --batch --verify yarn.js.asc yarn.js \
5757
&& rm yarn.js.asc \
5858
&& mv yarn.js /usr/local/bin/yarn \
5959
&& chmod +x /usr/local/bin/yarn \

0 commit comments

Comments
 (0)