diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fea542..857fb06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,8 @@ jobs: variant: alpine3.21 - name: alpine3.22 variant: alpine3.22 + - name: alpine3.23 + variant: alpine3.23 #VERSIONS name: ${{ matrix.name }} steps: diff --git a/.github/workflows/mirror_stable.yml b/.github/workflows/mirror_stable.yml index c832f9b..770fff7 100644 --- a/.github/workflows/mirror_stable.yml +++ b/.github/workflows/mirror_stable.yml @@ -37,6 +37,12 @@ jobs: 1.91-alpine3.22 1.91.1-alpine3.22 alpine3.22 + - name: alpine3.23 + tags: | + 1-alpine3.23 + 1.91-alpine3.23 + 1.91.1-alpine3.23 + alpine3.23 1-alpine 1.91-alpine 1.91.1-alpine diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4e67068..8201e19 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -68,6 +68,11 @@ jobs: platforms: linux/amd64,linux/arm64,linux/ppc64le tags: | nightly-alpine3.22 + - name: alpine3.23 + context: nightly/alpine3.23 + platforms: linux/amd64,linux/arm64,linux/ppc64le + tags: | + nightly-alpine3.23 nightly-alpine #VERSIONS name: ${{ matrix.name }} diff --git a/nightly/alpine3.23/Dockerfile b/nightly/alpine3.23/Dockerfile new file mode 100644 index 0000000..5d3cfed --- /dev/null +++ b/nightly/alpine3.23/Dockerfile @@ -0,0 +1,48 @@ +FROM alpine:3.23 + +LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust + +RUN apk add --no-cache \ + ca-certificates \ + musl-dev \ + gcc + +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH \ + RUST_VERSION=nightly + +RUN set -eux; \ + \ + arch="$(apk --print-arch)"; \ + case "$arch" in \ + 'x86_64') \ + rustArch='x86_64-unknown-linux-musl'; \ + rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \ + ;; \ + 'aarch64') \ + rustArch='aarch64-unknown-linux-musl'; \ + rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \ + ;; \ + 'ppc64le') \ + rustArch='powerpc64le-unknown-linux-musl'; \ + rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \ + ;; \ + *) \ + echo >&2 "unsupported architecture: $arch"; \ + exit 1; \ + ;; \ + esac; \ + \ + url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \ + wget "$url"; \ + echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ + \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ + rm rustup-init; \ + chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ + \ + rustup --version; \ + cargo --version; \ + rustc --version; diff --git a/stable/alpine3.23/Dockerfile b/stable/alpine3.23/Dockerfile new file mode 100644 index 0000000..ea015ad --- /dev/null +++ b/stable/alpine3.23/Dockerfile @@ -0,0 +1,48 @@ +FROM alpine:3.23 + +LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust + +RUN apk add --no-cache \ + ca-certificates \ + musl-dev \ + gcc + +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH \ + RUST_VERSION=1.91.1 + +RUN set -eux; \ + \ + arch="$(apk --print-arch)"; \ + case "$arch" in \ + 'x86_64') \ + rustArch='x86_64-unknown-linux-musl'; \ + rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \ + ;; \ + 'aarch64') \ + rustArch='aarch64-unknown-linux-musl'; \ + rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \ + ;; \ + 'ppc64le') \ + rustArch='powerpc64le-unknown-linux-musl'; \ + rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \ + ;; \ + *) \ + echo >&2 "unsupported architecture: $arch"; \ + exit 1; \ + ;; \ + esac; \ + \ + url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \ + wget "$url"; \ + echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ + \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ + rm rustup-init; \ + chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ + \ + rustup --version; \ + cargo --version; \ + rustc --version; diff --git a/x.py b/x.py index 31dd00e..03300f3 100755 --- a/x.py +++ b/x.py @@ -64,10 +64,11 @@ def write_versions(rust_version, rustup_version): AlpineArch("ppc64le", "ppc64le", "linux/ppc64le", "powerpc64le-unknown-linux-musl"), ] -latest_alpine_version = "3.22" +latest_alpine_version = "3.23" alpine_versions = [ "3.20", "3.21", + "3.22", latest_alpine_version, ]