Merge pull request #239 from paolobarbolini/alpine-3.22

Add Alpine 3.22 variant

Author: Muscraft

.github/workflows/ci.yml

@@ -36,6 +36,8 @@ jobs:
             variant: alpine3.20
           - name: alpine3.21
             variant: alpine3.21
+          - name: alpine3.22
+            variant: alpine3.22
 #VERSIONS
     name: ${{ matrix.name }}
     steps:

.github/workflows/nightly.yml

@@ -53,6 +53,11 @@ jobs:
             platforms: linux/amd64,linux/arm64
             tags: |
               nightly-alpine3.21
+          - name: alpine3.22
+            context: nightly/alpine3.22
+            platforms: linux/amd64,linux/arm64
+            tags: |
+              nightly-alpine3.22
               nightly-alpine
 #VERSIONS
     name: ${{ matrix.name }}

nightly/alpine3.22/Dockerfile

@@ -0,0 +1,30 @@
+FROM alpine:3.22
+
+LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
+
+RUN apk add --no-cache \
+        ca-certificates \
+        gcc
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH \
+    RUST_VERSION=nightly
+
+RUN set -eux; \
+    apkArch="$(apk --print-arch)"; \
+    case "$apkArch" in \
+        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
+        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
+        *) echo >&2 "unsupported architecture: $apkArch"; 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;

stable/alpine3.22/Dockerfile

@@ -0,0 +1,30 @@
+FROM alpine:3.22
+
+LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
+
+RUN apk add --no-cache \
+        ca-certificates \
+        gcc
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH \
+    RUST_VERSION=1.87.0
+
+RUN set -eux; \
+    apkArch="$(apk --print-arch)"; \
+    case "$apkArch" in \
+        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
+        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
+        *) echo >&2 "unsupported architecture: $apkArch"; 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;

x.py

@@ -49,9 +49,10 @@
 alpine_versions = [
     "3.20",
     "3.21",
+    "3.22",
 ]
 
-default_alpine_version = "3.21"
+default_alpine_version = "3.22"
 
 def rustup_hash(arch):
     url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"