Add Alpine 3.21 variant and drop Alpine 3.19

paolobarbolini · paolobarbolini · commit 85c88f3a3e19 · 2024-12-05T23:20:09.000+01:00
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.21/Dockerfile b/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.21/Dockerfile b/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"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.19`
	`1`	`+FROM alpine:3.21`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,11 @@`
`47`	`47`	`]`
`48`	`48`
`49`	`49`	`alpine_versions = [`
`50`		`- "3.19",`
`51`	`50`	`"3.20",`
	`51`	`+ "3.21",`
`52`	`52`	`]`
`53`	`53`
`54`		`-default_alpine_version = "3.20"`
	`54`	`+default_alpine_version = "3.21"`
`55`	`55`
`56`	`56`	`def rustup_hash(arch):`
`57`	`57`	`url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"`