Skip to content

Commit 48cd7ec

Browse files
MuscraftMuscraft
authored
Merge pull request #254 from Muscraft/image-cleanup
Image cleanup
2 parents a60270b + 7791344 commit 48cd7ec

File tree

22 files changed

+709
-273
lines changed

22 files changed

+709
-273
lines changed

‎Dockerfile-alpine.template‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ ENV RUSTUP_HOME=/usr/local/rustup \
1212
RUST_VERSION=%%RUST-VERSION%%
1313

1414
RUN set -eux; \
15+
\
1516
%%ARCH-CASE%%; \
17+
\
1618
url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
1719
wget "$url"; \
1820
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
21+
\
1922
chmod +x rustup-init; \
2023
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2124
rm rustup-init; \
2225
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
26+
\
2327
rustup --version; \
2428
cargo --version; \
2529
rustc --version;

‎Dockerfile-debian.template‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM buildpack-deps:%%DEBIAN-SUITE%%
1+
FROM buildpack-deps:%%TAG%%
22

33
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
44

@@ -8,14 +8,18 @@ ENV RUSTUP_HOME=/usr/local/rustup \
88
RUST_VERSION=%%RUST-VERSION%%
99

1010
RUN set -eux; \
11+
\
1112
%%ARCH-CASE%%; \
13+
\
1214
url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
13-
wget "$url"; \
15+
wget --progress=dot:giga "$url"; \
1416
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
17+
\
1518
chmod +x rustup-init; \
1619
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
1720
rm rustup-init; \
1821
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
22+
\
1923
rustup --version; \
2024
cargo --version; \
2125
rustc --version;

‎Dockerfile-slim.template‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:%%DEBIAN-SUITE%%-slim
1+
FROM debian:%%TAG%%-slim
22

33
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
44

@@ -8,25 +8,31 @@ ENV RUSTUP_HOME=/usr/local/rustup \
88
RUST_VERSION=%%RUST-VERSION%%
99

1010
RUN set -eux; \
11+
\
1112
apt-get update; \
1213
apt-get install -y --no-install-recommends \
1314
ca-certificates \
1415
gcc \
1516
libc6-dev \
1617
wget \
1718
; \
19+
\
1820
%%ARCH-CASE%%; \
21+
\
1922
url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
20-
wget "$url"; \
23+
wget --progress=dot:giga "$url"; \
2124
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
25+
\
2226
chmod +x rustup-init; \
2327
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2428
rm rustup-init; \
2529
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
26-
rustup --version; \
27-
cargo --version; \
28-
rustc --version; \
30+
\
2931
apt-get remove -y --auto-remove \
3032
wget \
3133
; \
32-
rm -rf /var/lib/apt/lists/*;
34+
rm -rf /var/lib/apt/lists/*; \
35+
\
36+
rustup --version; \
37+
cargo --version; \
38+
rustc --version;

‎nightly/alpine3.20/Dockerfile‎

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

1414
RUN set -eux; \
15-
apkArch="$(apk --print-arch)"; \
16-
case "$apkArch" in \
17-
x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
18-
aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
19-
ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
20-
*) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
15+
\
16+
arch="$(apk --print-arch)"; \
17+
case "$arch" in \
18+
'x86_64') \
19+
rustArch='x86_64-unknown-linux-musl'; \
20+
rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
21+
;; \
22+
'aarch64') \
23+
rustArch='aarch64-unknown-linux-musl'; \
24+
rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
25+
;; \
26+
'ppc64le') \
27+
rustArch='powerpc64le-unknown-linux-musl'; \
28+
rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
29+
;; \
30+
*) \
31+
echo >&2 "unsupported architecture: $arch"; \
32+
exit 1; \
33+
;; \
2134
esac; \
35+
\
2236
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2337
wget "$url"; \
2438
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
39+
\
2540
chmod +x rustup-init; \
2641
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2742
rm rustup-init; \
2843
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
44+
\
2945
rustup --version; \
3046
cargo --version; \
3147
rustc --version;

‎nightly/alpine3.21/Dockerfile‎

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

1414
RUN set -eux; \
15-
apkArch="$(apk --print-arch)"; \
16-
case "$apkArch" in \
17-
x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
18-
aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
19-
ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
20-
*) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
15+
\
16+
arch="$(apk --print-arch)"; \
17+
case "$arch" in \
18+
'x86_64') \
19+
rustArch='x86_64-unknown-linux-musl'; \
20+
rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
21+
;; \
22+
'aarch64') \
23+
rustArch='aarch64-unknown-linux-musl'; \
24+
rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
25+
;; \
26+
'ppc64le') \
27+
rustArch='powerpc64le-unknown-linux-musl'; \
28+
rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
29+
;; \
30+
*) \
31+
echo >&2 "unsupported architecture: $arch"; \
32+
exit 1; \
33+
;; \
2134
esac; \
35+
\
2236
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2337
wget "$url"; \
2438
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
39+
\
2540
chmod +x rustup-init; \
2641
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2742
rm rustup-init; \
2843
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
44+
\
2945
rustup --version; \
3046
cargo --version; \
3147
rustc --version;

‎nightly/alpine3.22/Dockerfile‎

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

1414
RUN set -eux; \
15-
apkArch="$(apk --print-arch)"; \
16-
case "$apkArch" in \
17-
x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
18-
aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
19-
ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
20-
*) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
15+
\
16+
arch="$(apk --print-arch)"; \
17+
case "$arch" in \
18+
'x86_64') \
19+
rustArch='x86_64-unknown-linux-musl'; \
20+
rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
21+
;; \
22+
'aarch64') \
23+
rustArch='aarch64-unknown-linux-musl'; \
24+
rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
25+
;; \
26+
'ppc64le') \
27+
rustArch='powerpc64le-unknown-linux-musl'; \
28+
rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
29+
;; \
30+
*) \
31+
echo >&2 "unsupported architecture: $arch"; \
32+
exit 1; \
33+
;; \
2134
esac; \
35+
\
2236
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
2337
wget "$url"; \
2438
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
39+
\
2540
chmod +x rustup-init; \
2641
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2742
rm rustup-init; \
2843
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
44+
\
2945
rustup --version; \
3046
cargo --version; \
3147
rustc --version;

‎nightly/bookworm/Dockerfile‎

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

1010
RUN set -eux; \
11-
dpkgArch="$(dpkg --print-architecture)"; \
12-
case "${dpkgArch##*-}" in \
13-
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
14-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
15-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
16-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
17-
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
18-
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
19-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
11+
\
12+
arch="$(dpkg --print-architecture)"; \
13+
case "$arch" in \
14+
'amd64') \
15+
rustArch='x86_64-unknown-linux-gnu'; \
16+
rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
17+
;; \
18+
'armhf') \
19+
rustArch='armv7-unknown-linux-gnueabihf'; \
20+
rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
21+
;; \
22+
'arm64') \
23+
rustArch='aarch64-unknown-linux-gnu'; \
24+
rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
25+
;; \
26+
'i386') \
27+
rustArch='i686-unknown-linux-gnu'; \
28+
rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
29+
;; \
30+
'ppc64el') \
31+
rustArch='powerpc64le-unknown-linux-gnu'; \
32+
rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
33+
;; \
34+
's390x') \
35+
rustArch='s390x-unknown-linux-gnu'; \
36+
rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
37+
;; \
38+
*) \
39+
echo >&2 "unsupported architecture: $arch"; \
40+
exit 1; \
41+
;; \
2042
esac; \
43+
\
2144
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
22-
wget "$url"; \
45+
wget --progress=dot:giga "$url"; \
2346
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
47+
\
2448
chmod +x rustup-init; \
2549
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2650
rm rustup-init; \
2751
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
52+
\
2853
rustup --version; \
2954
cargo --version; \
3055
rustc --version;

‎nightly/bookworm/slim/Dockerfile‎

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

1010
RUN set -eux; \
11+
\
1112
apt-get update; \
1213
apt-get install -y --no-install-recommends \
1314
ca-certificates \
1415
gcc \
1516
libc6-dev \
1617
wget \
1718
; \
18-
dpkgArch="$(dpkg --print-architecture)"; \
19-
case "${dpkgArch##*-}" in \
20-
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
21-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
22-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
23-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
24-
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
25-
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
26-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
19+
\
20+
arch="$(dpkg --print-architecture)"; \
21+
case "$arch" in \
22+
'amd64') \
23+
rustArch='x86_64-unknown-linux-gnu'; \
24+
rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
25+
;; \
26+
'armhf') \
27+
rustArch='armv7-unknown-linux-gnueabihf'; \
28+
rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
29+
;; \
30+
'arm64') \
31+
rustArch='aarch64-unknown-linux-gnu'; \
32+
rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
33+
;; \
34+
'i386') \
35+
rustArch='i686-unknown-linux-gnu'; \
36+
rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
37+
;; \
38+
'ppc64el') \
39+
rustArch='powerpc64le-unknown-linux-gnu'; \
40+
rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
41+
;; \
42+
's390x') \
43+
rustArch='s390x-unknown-linux-gnu'; \
44+
rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
45+
;; \
46+
*) \
47+
echo >&2 "unsupported architecture: $arch"; \
48+
exit 1; \
49+
;; \
2750
esac; \
51+
\
2852
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
29-
wget "$url"; \
53+
wget --progress=dot:giga "$url"; \
3054
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
55+
\
3156
chmod +x rustup-init; \
3257
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
3358
rm rustup-init; \
3459
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
35-
rustup --version; \
36-
cargo --version; \
37-
rustc --version; \
60+
\
3861
apt-get remove -y --auto-remove \
3962
wget \
4063
; \
41-
rm -rf /var/lib/apt/lists/*;
64+
rm -rf /var/lib/apt/lists/*; \
65+
\
66+
rustup --version; \
67+
cargo --version; \
68+
rustc --version;

0 commit comments

Comments
 (0)