Skip to content

Commit 4e0c4c8

Browse files
author
Christopher Horrell
committed
curl: use -f flag consistently
Curl will fail silently with error 22 rather outputting the html error document
1 parent 9002951 commit 4e0c4c8

File tree

23 files changed

+46
-46
lines changed

23 files changed

+46
-46
lines changed

‎10/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
i386) ARCH='x86';; \
3333
*) echo "unsupported architecture"; exit 1 ;; \
3434
esac \
35-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
35+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36+
&& curl -fsSLO --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-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3939
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

‎10/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \
3131
gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
3232
gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
3333
done \
34-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
35-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
34+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
35+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3636
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
3737
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3838
&& tar -xf "node-v$NODE_VERSION.tar.xz" \

‎10/slim/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \
3636
&& set -x \
3737
&& apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \
3838
&& rm -rf /var/lib/apt/lists/* \
39-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
40-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
39+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
40+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
4141
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
4242
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4343
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

‎10/stretch/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
i386) ARCH='x86';; \
3333
*) echo "unsupported architecture"; exit 1 ;; \
3434
esac \
35-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
35+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36+
&& curl -fsSLO --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-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3939
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

‎6/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
i386) ARCH='x86';; \
3333
*) echo "unsupported architecture"; exit 1 ;; \
3434
esac \
35-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
35+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36+
&& curl -fsSLO --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-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3939
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

‎6/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \
3131
gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
3232
gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
3333
done \
34-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
35-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
34+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
35+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3636
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
3737
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3838
&& tar -xf "node-v$NODE_VERSION.tar.xz" \

‎6/slim/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \
3636
&& set -x \
3737
&& apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \
3838
&& rm -rf /var/lib/apt/lists/* \
39-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
40-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
39+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
40+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
4141
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
4242
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4343
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

‎6/stretch/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
i386) ARCH='x86';; \
3333
*) echo "unsupported architecture"; exit 1 ;; \
3434
esac \
35-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
35+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36+
&& curl -fsSLO --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-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3939
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

‎8/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
i386) ARCH='x86';; \
3333
*) echo "unsupported architecture"; exit 1 ;; \
3434
esac \
35-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
35+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
36+
&& curl -fsSLO --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-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3939
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

‎8/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \
3131
gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
3232
gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
3333
done \
34-
&& curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
35-
&& curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
34+
&& curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
35+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3636
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
3737
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3838
&& tar -xf "node-v$NODE_VERSION.tar.xz" \

0 commit comments

Comments
 (0)