Skip to content

Commit f21cff0

Browse files
MuscraftMuscraft
committed
refactor: Unify arch case creation
1 parent 41cc135 commit f21cff0

File tree

19 files changed

+68
-64
lines changed

19 files changed

+68
-64
lines changed

‎nightly/alpine3.20/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
1212
RUST_VERSION=nightly
1313

1414
RUN set -eux; \
15-
apkArch="$(apk --print-arch)"; \
16-
case "$apkArch" in \
15+
arch="$(apk --print-arch)"; \
16+
case "$arch" in \
1717
x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
1818
aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
1919
ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
20-
*) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
20+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2121
esac; \
2222
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2323
wget "$url"; \

‎nightly/alpine3.21/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
1212
RUST_VERSION=nightly
1313

1414
RUN set -eux; \
15-
apkArch="$(apk --print-arch)"; \
16-
case "$apkArch" in \
15+
arch="$(apk --print-arch)"; \
16+
case "$arch" in \
1717
x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
1818
aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
1919
ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
20-
*) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
20+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2121
esac; \
2222
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2323
wget "$url"; \

‎nightly/alpine3.22/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
1212
RUST_VERSION=nightly
1313

1414
RUN set -eux; \
15-
apkArch="$(apk --print-arch)"; \
16-
case "$apkArch" in \
15+
arch="$(apk --print-arch)"; \
16+
case "$arch" in \
1717
x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
1818
aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
1919
ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
20-
*) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
20+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2121
esac; \
2222
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2323
wget "$url"; \

‎nightly/bookworm/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
88
RUST_VERSION=nightly
99

1010
RUN set -eux; \
11-
dpkgArch="$(dpkg --print-architecture)"; \
12-
case "${dpkgArch##*-}" in \
11+
arch="$(dpkg --print-architecture)"; \
12+
case "$arch" in \
1313
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
1414
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
1515
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
1616
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
1717
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
1818
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
19-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
19+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2020
esac; \
2121
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2222
wget "$url"; \

‎nightly/bookworm/slim/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ RUN set -eux; \
1515
libc6-dev \
1616
wget \
1717
; \
18-
dpkgArch="$(dpkg --print-architecture)"; \
19-
case "${dpkgArch##*-}" in \
18+
arch="$(dpkg --print-architecture)"; \
19+
case "$arch" in \
2020
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
2121
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
2222
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
2323
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
2424
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
2525
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
26-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
26+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2727
esac; \
2828
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2929
wget "$url"; \

‎nightly/bullseye/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ ENV RUSTUP_HOME=/usr/local/rustup \
88
RUST_VERSION=nightly
99

1010
RUN set -eux; \
11-
dpkgArch="$(dpkg --print-architecture)"; \
12-
case "${dpkgArch##*-}" in \
11+
arch="$(dpkg --print-architecture)"; \
12+
case "$arch" in \
1313
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
1414
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
1515
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
1616
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
17-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
17+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
1818
esac; \
1919
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2020
wget "$url"; \

‎nightly/bullseye/slim/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ RUN set -eux; \
1515
libc6-dev \
1616
wget \
1717
; \
18-
dpkgArch="$(dpkg --print-architecture)"; \
19-
case "${dpkgArch##*-}" in \
18+
arch="$(dpkg --print-architecture)"; \
19+
case "$arch" in \
2020
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
2121
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
2222
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
2323
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
24-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
24+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2525
esac; \
2626
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2727
wget "$url"; \

‎nightly/trixie/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ ENV RUSTUP_HOME=/usr/local/rustup \
88
RUST_VERSION=nightly
99

1010
RUN set -eux; \
11-
dpkgArch="$(dpkg --print-architecture)"; \
12-
case "${dpkgArch##*-}" in \
11+
arch="$(dpkg --print-architecture)"; \
12+
case "$arch" in \
1313
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
1414
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
1515
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
1616
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
1717
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
1818
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
1919
riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
20-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
20+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2121
esac; \
2222
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2323
wget "$url"; \

‎nightly/trixie/slim/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ RUN set -eux; \
1515
libc6-dev \
1616
wget \
1717
; \
18-
dpkgArch="$(dpkg --print-architecture)"; \
19-
case "${dpkgArch##*-}" in \
18+
arch="$(dpkg --print-architecture)"; \
19+
case "$arch" in \
2020
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
2121
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
2222
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
2323
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
2424
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
2525
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
2626
riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
27-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
27+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2828
esac; \
2929
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
3030
wget "$url"; \

‎stable/alpine3.20/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
1212
RUST_VERSION=1.90.0
1313

1414
RUN set -eux; \
15-
apkArch="$(apk --print-arch)"; \
16-
case "$apkArch" in \
15+
arch="$(apk --print-arch)"; \
16+
case "$arch" in \
1717
x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
1818
aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
1919
ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
20-
*) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
20+
*) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
2121
esac; \
2222
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2323
wget "$url"; \

0 commit comments

Comments
 (0)