Merge pull request #221 from paolobarbolini/alpine-3.21

Add Alpine 3.21 variant and drop Alpine 3.19
rust-lang · Dec 5, 2024 · fab440a · fab440a
2 parents 611e4d3 + 85c88f3
commit fab440a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,10 +32,10 @@ jobs:
             variant: bookworm
           - name: slim-bookworm
             variant: bookworm/slim
-          - name: alpine3.19
-            variant: alpine3.19
           - name: alpine3.20
             variant: alpine3.20
+          - name: alpine3.21
+            variant: alpine3.21
 #VERSIONS
     name: ${{ matrix.name }}
     steps:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -43,16 +43,16 @@ jobs:
             tags: |
               nightly-bookworm-slim
               nightly-slim
-          - name: alpine3.19
-            context: nightly/alpine3.19
-            platforms: linux/amd64,linux/arm64
-            tags: |
-              nightly-alpine3.19
           - name: alpine3.20
             context: nightly/alpine3.20
             platforms: linux/amd64,linux/arm64
             tags: |
               nightly-alpine3.20
+          - name: alpine3.21
+            context: nightly/alpine3.21
+            platforms: linux/amd64,linux/arm64
+            tags: |
+              nightly-alpine3.21
               nightly-alpine
 #VERSIONS
     name: ${{ matrix.name }}

diff --git a/nightly/alpine3.19/Dockerfile → nightly/alpine3.21/Dockerfile b/nightly/alpine3.19/Dockerfile → nightly/alpine3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.21
 
 LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
 

diff --git a/stable/alpine3.19/Dockerfile → stable/alpine3.21/Dockerfile b/stable/alpine3.19/Dockerfile → stable/alpine3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.21
 
 LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
 

diff --git a/x.py b/x.py
@@ -47,11 +47,11 @@
 ]
 
 alpine_versions = [
-    "3.19",
     "3.20",
+    "3.21",
 ]
 
-default_alpine_version = "3.20"
+default_alpine_version = "3.21"
 
 def rustup_hash(arch):
     url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"