Merge pull request #990 from jnoordsij/alpine3.21

Add Alpine 3.21 variant
docker-library · Dec 5, 2024 · b4e9e3a · b4e9e3a
2 parents ed65ea9 + 3d7b328
commit b4e9e3a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/3.10/alpine3.19/Dockerfile → 3.10/alpine3.21/Dockerfile b/3.10/alpine3.19/Dockerfile → 3.10/alpine3.21/Dockerfile
diff --git a/3.11/alpine3.19/Dockerfile → 3.11/alpine3.21/Dockerfile b/3.11/alpine3.19/Dockerfile → 3.11/alpine3.21/Dockerfile
diff --git a/3.12/alpine3.19/Dockerfile → 3.12/alpine3.21/Dockerfile b/3.12/alpine3.19/Dockerfile → 3.12/alpine3.21/Dockerfile
diff --git a/3.13/alpine3.19/Dockerfile → 3.13/alpine3.21/Dockerfile b/3.13/alpine3.19/Dockerfile → 3.13/alpine3.21/Dockerfile
diff --git a/3.14-rc/alpine3.19/Dockerfile → 3.14-rc/alpine3.21/Dockerfile b/3.14-rc/alpine3.19/Dockerfile → 3.14-rc/alpine3.21/Dockerfile
diff --git a/3.9/alpine3.19/Dockerfile → 3.9/alpine3.21/Dockerfile b/3.9/alpine3.19/Dockerfile → 3.9/alpine3.21/Dockerfile
diff --git a/versions.json b/versions.json
@@ -13,8 +13,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.20",
-      "alpine3.19"
+      "alpine3.21",
+      "alpine3.20"
     ],
     "version": "3.10.16"
   },
@@ -32,8 +32,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.20",
-      "alpine3.19"
+      "alpine3.21",
+      "alpine3.20"
     ],
     "version": "3.11.11"
   },
@@ -51,8 +51,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
+      "alpine3.21",
       "alpine3.20",
-      "alpine3.19",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809"
     ],
@@ -72,8 +72,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
+      "alpine3.21",
       "alpine3.20",
-      "alpine3.19",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809"
     ],
@@ -93,8 +93,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
+      "alpine3.21",
       "alpine3.20",
-      "alpine3.19",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809"
     ],
@@ -114,8 +114,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.20",
-      "alpine3.19"
+      "alpine3.21",
+      "alpine3.20"
     ],
     "version": "3.9.21"
   }

diff --git a/versions.sh b/versions.sh
@@ -200,8 +200,8 @@ for version in "${versions[@]}"; do
 					empty
 				| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
 				(
+					"3.21",
 					"3.20",
-					"3.19",
 					empty
 				| "alpine" + .),
 				if env.hasWindows != "" then
-Original file line number
+Diff line change
@@ Expand Up / @@ -200,8 +200,8 @@ for version in "${versions[@]}"; do @@
     					empty
     				| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
     				(
+    					"3.21",
     					"3.20",
-    					"3.19",
     					empty
     				| "alpine" + .),
     				if env.hasWindows != "" then
@@ Expand Down @@