Skip to content

Commit 897a905

Browse files
aduh95aduh95
committed
fixup! squash! no pipefail
1 parent 26513fd commit 897a905

32 files changed

Lines changed: 108 additions & 140 deletions

File tree

‎20/alpine3.22/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ RUN addgroup -g 1000 node \
4040
&& export GNUPGHOME="$(mktemp -d)" \
4141
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
4242
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
43-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
45-
| grep " node-v$NODE_VERSION.tar.xz\$" \
46-
| sha256sum -c - \
43+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
45+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4746
&& rm -rf "$GNUPGHOME" \
4847
&& tar -xJf "node-v$NODE_VERSION.tar.xz" \
4948
&& cd "node-v$NODE_VERSION" \

‎20/alpine3.23/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ RUN addgroup -g 1000 node \
4040
&& export GNUPGHOME="$(mktemp -d)" \
4141
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
4242
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
43-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
45-
| grep " node-v$NODE_VERSION.tar.xz\$" \
46-
| sha256sum -c - \
43+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
45+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4746
&& rm -rf "$GNUPGHOME" \
4847
&& tar -xJf "node-v$NODE_VERSION.tar.xz" \
4948
&& cd "node-v$NODE_VERSION" \

‎20/bookworm-slim/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2323
&& set -exo pipefail \
2424
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
2525
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
26-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
28-
| grep " node-v$NODE_VERSION.tar.xz\$" \
29-
| sha256sum -c - \
26+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
28+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3029
&& rm -rf "$GNUPGHOME" \
3130
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
3231
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

‎20/bookworm/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& export GNUPGHOME="$(mktemp -d)" \
19-
&& set -exo pipefail \
19+
&& set -ex \
2020
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
2121
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
22-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
23-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
24-
| grep " node-v$NODE_VERSION.tar.xz\$" \
25-
| sha256sum -c - \
22+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
23+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
24+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
2625
&& rm -rf "$GNUPGHOME" \
2726
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
2827
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

‎20/bullseye-slim/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2323
&& set -exo pipefail \
2424
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
2525
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
26-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
28-
| grep " node-v$NODE_VERSION.tar.xz\$" \
29-
| sha256sum -c - \
26+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
28+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3029
&& rm -rf "$GNUPGHOME" \
3130
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
3231
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

‎20/bullseye/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& export GNUPGHOME="$(mktemp -d)" \
19-
&& set -exo pipefail \
19+
&& set -ex \
2020
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
2121
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
22-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
23-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
24-
| grep " node-v$NODE_VERSION.tar.xz\$" \
25-
| sha256sum -c - \
22+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
23+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
24+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
2625
&& rm -rf "$GNUPGHOME" \
2726
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
2827
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

‎20/trixie-slim/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2323
&& set -exo pipefail \
2424
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
2525
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
26-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
28-
| grep " node-v$NODE_VERSION.tar.xz\$" \
29-
| sha256sum -c - \
26+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
27+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
28+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
3029
&& rm -rf "$GNUPGHOME" \
3130
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
3231
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

‎20/trixie/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
1616
*) echo "unsupported architecture"; exit 1 ;; \
1717
esac \
1818
&& export GNUPGHOME="$(mktemp -d)" \
19-
&& set -exo pipefail \
19+
&& set -ex \
2020
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
2121
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
22-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
23-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
24-
| grep " node-v$NODE_VERSION.tar.xz\$" \
25-
| sha256sum -c - \
22+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
23+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
24+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
2625
&& rm -rf "$GNUPGHOME" \
2726
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
2827
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" \

‎22/alpine3.22/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ RUN addgroup -g 1000 node \
4040
&& export GNUPGHOME="$(mktemp -d)" \
4141
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
4242
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
43-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
45-
| grep " node-v$NODE_VERSION.tar.xz\$" \
46-
| sha256sum -c - \
43+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
45+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4746
&& rm -rf "$GNUPGHOME" \
4847
&& tar -xJf "node-v$NODE_VERSION.tar.xz" \
4948
&& cd "node-v$NODE_VERSION" \

‎22/alpine3.23/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ RUN addgroup -g 1000 node \
4040
&& export GNUPGHOME="$(mktemp -d)" \
4141
&& (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/b362bd15f2ac7ce350d7563fc03e0c625e455e5f/gpg-only-active-keys/pubring.kbx" && echo "6676a927d6261a7ab6bb4ddc69614823567426bb9ac77aee484cfb5d66f4a148 pubring.kbx" | sha256sum -c) \
4242
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
43-
&& curl -fsSL --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44-
| gpgv --keyring="$GNUPGHOME/pubring.kbx" --output - \
45-
| grep " node-v$NODE_VERSION.tar.xz\$" \
46-
| sha256sum -c - \
43+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
44+
&& gpgv --keyring="$GNUPGHOME/pubring.kbx" --output SHASUMS256.txt < SHASUMS256.txt.asc \
45+
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
4746
&& rm -rf "$GNUPGHOME" \
4847
&& tar -xJf "node-v$NODE_VERSION.tar.xz" \
4948
&& cd "node-v$NODE_VERSION" \

0 commit comments

Comments
 (0)