From 85c88f3a3e192ad11f392e829c54ded1178e8447 Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo.barbolini@m4ss.net>
Date: Thu, 5 Dec 2024 23:20:09 +0100
Subject: [PATCH] Add Alpine 3.21 variant and drop Alpine 3.19

---
 .github/workflows/ci.yml                      |  4 ++--
 .github/workflows/nightly.yml                 | 10 +++++-----
 nightly/{alpine3.19 => alpine3.21}/Dockerfile |  2 +-
 stable/{alpine3.19 => alpine3.21}/Dockerfile  |  2 +-
 x.py                                          |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename nightly/{alpine3.19 => alpine3.21}/Dockerfile (98%)
 rename stable/{alpine3.19 => alpine3.21}/Dockerfile (98%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 44dd200..d29194e 100644
--- 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
index 339c72e..71d351f 100644
--- 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 b/nightly/alpine3.21/Dockerfile
similarity index 98%
rename from nightly/alpine3.19/Dockerfile
rename to nightly/alpine3.21/Dockerfile
index 184a977..8a834d0 100644
--- a/nightly/alpine3.19/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.19/Dockerfile b/stable/alpine3.21/Dockerfile
similarity index 98%
rename from stable/alpine3.19/Dockerfile
rename to stable/alpine3.21/Dockerfile
index c601ed6..1486f96 100644
--- a/stable/alpine3.19/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
index 89cb791..60a0024 100755
--- 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"