From 99c091a614a2e7cea79d3d6db52b8c6c533e42ac Mon Sep 17 00:00:00 2001
From: Earlopain <14981592+Earlopain@users.noreply.github.com>
Date: Wed, 22 May 2024 22:00:02 +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 7bbdeaa5f..38193766f 100644
--- a/versions.json
+++ b/versions.json
@@ -70,8 +70,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.19",
-      "alpine3.18"
+      "alpine3.20",
+      "alpine3.19"
     ]
   },
   "3.2": {
@@ -108,8 +108,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.19",
-      "alpine3.18"
+      "alpine3.20",
+      "alpine3.19"
     ],
     "rust": {
       "version": "1.74.1"
@@ -179,8 +179,8 @@
       "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "alpine3.19",
-      "alpine3.18"
+      "alpine3.20",
+      "alpine3.19"
     ],
     "rust": {
       "version": "1.74.1"
@@ -256,8 +256,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 65edfc8e5..22f87d060 100755
--- a/versions.sh
+++ b/versions.sh
@@ -99,8 +99,8 @@ for version in "${versions[@]}"; do
 				# https://bugs.ruby-lang.org/issues/18658
 				# https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174
 				if  "3.0" == env.version then "3.16" else
+					"3.20",
 					"3.19",
-					"3.18",
 					empty # trailing comma hack
 				end
 			| "alpine" + .)