Skip to content

Commit 75656a9

Browse files
Upgrade Alpine Linux to 3.24
1 parent 0b4350f commit 75656a9

6 files changed

Lines changed: 112 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
variant: alpine3.22
4343
- name: alpine3.23
4444
variant: alpine3.23
45+
- name: alpine3.24
46+
variant: alpine3.24
4547
#VERSIONS
4648
name: ${{ matrix.name }}
4749
steps:

.github/workflows/mirror_stable.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ jobs:
3737
1.96-alpine3.23
3838
1.96.0-alpine3.23
3939
alpine3.23
40+
- name: alpine3.24
41+
tags: |
42+
1-alpine3.24
43+
1.96-alpine3.24
44+
1.96.0-alpine3.24
45+
alpine3.24
4046
1-alpine
4147
1.96-alpine
4248
1.96.0-alpine

.github/workflows/nightly.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ jobs:
6969
platforms: linux/amd64,linux/arm64,linux/ppc64le
7070
tags: |
7171
nightly-alpine3.23
72+
- name: alpine3.24
73+
context: nightly/alpine3.24
74+
platforms: linux/amd64,linux/arm64,linux/ppc64le
75+
tags: |
76+
nightly-alpine3.24
7277
nightly-alpine
7378
#VERSIONS
7479
name: ${{ matrix.name }}

nightly/alpine3.24/Dockerfile

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
FROM alpine:3.24
2+
3+
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
4+
5+
RUN apk add --no-cache \
6+
ca-certificates \
7+
musl-dev \
8+
gcc
9+
10+
ARG RUST_VERSION=nightly
11+
ENV RUSTUP_HOME=/usr/local/rustup \
12+
CARGO_HOME=/usr/local/cargo \
13+
PATH=/usr/local/cargo/bin:$PATH \
14+
RUST_VERSION=${RUST_VERSION}
15+
16+
RUN set -eux; \
17+
\
18+
arch="$(apk --print-arch)"; \
19+
case "$arch" in \
20+
'x86_64') \
21+
rustArch='x86_64-unknown-linux-musl'; \
22+
rustupSha256='9cd3fda5fd293890e36ab271af6a786ee22084b5f6c2b83fd8323cec6f0992c1'; \
23+
;; \
24+
'aarch64') \
25+
rustArch='aarch64-unknown-linux-musl'; \
26+
rustupSha256='88761caacddb92cd79b0b1f939f3990ba1997d701a38b3e8dd6746a562f2a759'; \
27+
;; \
28+
'ppc64le') \
29+
rustArch='powerpc64le-unknown-linux-musl'; \
30+
rustupSha256='e15d033af90b7a55d170aac2d82cc28ddd96dbfcdda7c6d4eb8cb064a99c4646'; \
31+
;; \
32+
*) \
33+
echo >&2 "unsupported architecture: $arch"; \
34+
exit 1; \
35+
;; \
36+
esac; \
37+
\
38+
url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \
39+
wget "$url"; \
40+
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
41+
\
42+
chmod +x rustup-init; \
43+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
44+
rm rustup-init; \
45+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
46+
\
47+
rustup --version; \
48+
cargo --version; \
49+
rustc --version;

stable/alpine3.24/Dockerfile

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
FROM alpine:3.24
2+
3+
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
4+
5+
RUN apk add --no-cache \
6+
ca-certificates \
7+
musl-dev \
8+
gcc
9+
10+
ENV RUSTUP_HOME=/usr/local/rustup \
11+
CARGO_HOME=/usr/local/cargo \
12+
PATH=/usr/local/cargo/bin:$PATH \
13+
RUST_VERSION=1.96.0
14+
15+
RUN set -eux; \
16+
\
17+
arch="$(apk --print-arch)"; \
18+
case "$arch" in \
19+
'x86_64') \
20+
rustArch='x86_64-unknown-linux-musl'; \
21+
rustupSha256='9cd3fda5fd293890e36ab271af6a786ee22084b5f6c2b83fd8323cec6f0992c1'; \
22+
;; \
23+
'aarch64') \
24+
rustArch='aarch64-unknown-linux-musl'; \
25+
rustupSha256='88761caacddb92cd79b0b1f939f3990ba1997d701a38b3e8dd6746a562f2a759'; \
26+
;; \
27+
'ppc64le') \
28+
rustArch='powerpc64le-unknown-linux-musl'; \
29+
rustupSha256='e15d033af90b7a55d170aac2d82cc28ddd96dbfcdda7c6d4eb8cb064a99c4646'; \
30+
;; \
31+
*) \
32+
echo >&2 "unsupported architecture: $arch"; \
33+
exit 1; \
34+
;; \
35+
esac; \
36+
\
37+
url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \
38+
wget "$url"; \
39+
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
40+
\
41+
chmod +x rustup-init; \
42+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
43+
rm rustup-init; \
44+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
45+
\
46+
rustup --version; \
47+
cargo --version; \
48+
rustc --version;

x.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ def write_versions(rust_version, rustup_version):
6464
AlpineArch("ppc64le", "ppc64le", "linux/ppc64le", "powerpc64le-unknown-linux-musl"),
6565
]
6666

67-
latest_alpine_version = "3.23"
67+
latest_alpine_version = "3.24"
6868
alpine_versions = [
6969
"3.21",
7070
"3.22",
71+
"3.23",
7172
latest_alpine_version,
7273
]
7374

0 commit comments

Comments
 (0)