From a4c6c26df171630eca259b1254a8b374c2eb0a43 Mon Sep 17 00:00:00 2001
From: Earlopain <14981592+Earlopain@users.noreply.github.com>
Date: Wed, 22 May 2024 23:02:17 +0200
Subject: [PATCH] Add alpine 3.20

https://alpinelinux.org/posts/Alpine-3.20.0-released.html
---
 3.1/{alpine3.18 => alpine3.20}/Dockerfile    |  2 +-
 3.2/{alpine3.18 => alpine3.20}/Dockerfile    |  2 +-
 3.3/{alpine3.18 => alpine3.20}/Dockerfile    |  2 +-
 3.4-rc/{alpine3.18 => alpine3.20}/Dockerfile |  2 +-
 versions.json                                | 16 ++++++++--------
 versions.sh                                  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename 3.1/{alpine3.18 => alpine3.20}/Dockerfile (99%)
 rename 3.2/{alpine3.18 => alpine3.20}/Dockerfile (99%)
 rename 3.3/{alpine3.18 => alpine3.20}/Dockerfile (99%)
 rename 3.4-rc/{alpine3.18 => alpine3.20}/Dockerfile (99%)

diff --git a/3.1/alpine3.18/Dockerfile b/3.1/alpine3.20/Dockerfile
similarity index 99%
rename from 3.1/alpine3.18/Dockerfile
rename to 3.1/alpine3.20/Dockerfile
index eed94cc85..f8dbb65ce 100644
--- a/3.1/alpine3.18/Dockerfile
+++ b/3.1/alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/3.2/alpine3.18/Dockerfile b/3.2/alpine3.20/Dockerfile
similarity index 99%
rename from 3.2/alpine3.18/Dockerfile
rename to 3.2/alpine3.20/Dockerfile
index b7ad3ec2d..acafda504 100644
--- a/3.2/alpine3.18/Dockerfile
+++ b/3.2/alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.20/Dockerfile
similarity index 99%
rename from 3.3/alpine3.18/Dockerfile
rename to 3.3/alpine3.20/Dockerfile
index 324bd2365..292ac6714 100644
--- a/3.3/alpine3.18/Dockerfile
+++ b/3.3/alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/3.4-rc/alpine3.18/Dockerfile b/3.4-rc/alpine3.20/Dockerfile
similarity index 99%
rename from 3.4-rc/alpine3.18/Dockerfile
rename to 3.4-rc/alpine3.20/Dockerfile
index 9931b5bb1..3417b89dc 100644
--- a/3.4-rc/alpine3.18/Dockerfile
+++ b/3.4-rc/alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/versions.json b/versions.json
index cc29bc2ad..7cdcc8cc8 100644
--- a/versions.json
+++ b/versions.json
@@ -33,8 +33,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.19",
-      "alpine3.18"
+      "alpine3.20",
+      "alpine3.19"
     ]
   },
   "3.2": {
@@ -71,8 +71,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.19",
-      "alpine3.18"
+      "alpine3.20",
+      "alpine3.19"
     ],
     "rust": {
       "version": "1.74.1"
@@ -142,8 +142,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.19",
-      "alpine3.18"
+      "alpine3.20",
+      "alpine3.19"
     ],
     "rust": {
       "version": "1.74.1"
@@ -219,8 +219,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.19",
-      "alpine3.18"
+      "alpine3.20",
+      "alpine3.19"
     ],
     "rust": {
       "version": "1.74.1"
diff --git a/versions.sh b/versions.sh
index c25e060ad..d5e02efee 100755
--- a/versions.sh
+++ b/versions.sh
@@ -88,8 +88,8 @@ for version in "${versions[@]}"; do
 				empty # trailing comma hack
 			| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
 			(
+				"3.20",
 				"3.19",
-				"3.18",
 				empty # trailing comma hack
 			| "alpine" + .)
 		]