Skip to content

Commit 37378fe

Browse files
authored
Merge pull request #2257 from orgads/star-s390x
Remove stray * for linux*-s390x in slim images
2 parents dd95409 + ec45cd2 commit 37378fe

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

20/bookworm-slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
12+
s390x) ARCH='s390x' OPENSSL_ARCH='linux-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1414
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1515
i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \

20/bullseye-slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
12+
s390x) ARCH='s390x' OPENSSL_ARCH='linux-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1414
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1515
i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \

22/bookworm-slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
12+
s390x) ARCH='s390x' OPENSSL_ARCH='linux-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1414
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1515
i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \

22/bullseye-slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
12+
s390x) ARCH='s390x' OPENSSL_ARCH='linux-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1414
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1515
i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \

24/bookworm-slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
12+
s390x) ARCH='s390x' OPENSSL_ARCH='linux-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1414
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1515
i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \

24/bullseye-slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
12+
s390x) ARCH='s390x' OPENSSL_ARCH='linux-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1414
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1515
i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \

Dockerfile-slim.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
99
&& case "${dpkgArch##*-}" in \
1010
amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \
1111
ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \
12-
s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \
12+
s390x) ARCH='s390x' OPENSSL_ARCH='linux-s390x';; \
1313
arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \
1414
armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \
1515
i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \

0 commit comments

Comments
 (0)