From cf7a37dedf1fd5a25ca72075645368d1e3c30c4a Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <jesper@sslleiden.nl>
Date: Wed, 22 May 2024 14:22:57 +0200
Subject: [PATCH] Add Alpine 3.20 and drop 3.18

---
 1.21/{alpine3.18 => alpine3.20}/Dockerfile | 4 ++--
 1.22/{alpine3.18 => alpine3.20}/Dockerfile | 4 ++--
 versions.json                              | 4 ++--
 versions.sh                                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename 1.21/{alpine3.18 => alpine3.20}/Dockerfile (98%)
 rename 1.22/{alpine3.18 => alpine3.20}/Dockerfile (98%)

diff --git a/1.21/alpine3.18/Dockerfile b/1.21/alpine3.20/Dockerfile
similarity index 98%
rename from 1.21/alpine3.18/Dockerfile
rename to 1.21/alpine3.20/Dockerfile
index 9be437c3..1c3423da 100644
--- a/1.21/alpine3.18/Dockerfile
+++ b/1.21/alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18 AS build
+FROM alpine:3.20 AS build
 
 ENV PATH /usr/local/go/bin:$PATH
 
@@ -100,7 +100,7 @@ RUN set -eux; \
 	epoch="$(stat -c '%Y' /usr/local/go)"; \
 	[ "$SOURCE_DATE_EPOCH" = "$epoch" ]
 
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/1.22/alpine3.18/Dockerfile b/1.22/alpine3.20/Dockerfile
similarity index 98%
rename from 1.22/alpine3.18/Dockerfile
rename to 1.22/alpine3.20/Dockerfile
index 599c471e..7ae24f46 100644
--- a/1.22/alpine3.18/Dockerfile
+++ b/1.22/alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18 AS build
+FROM alpine:3.20 AS build
 
 ENV PATH /usr/local/go/bin:$PATH
 
@@ -100,7 +100,7 @@ RUN set -eux; \
 	epoch="$(stat -c '%Y' /usr/local/go)"; \
 	[ "$SOURCE_DATE_EPOCH" = "$epoch" ]
 
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/versions.json b/versions.json
index adde4118..6db8c988 100644
--- a/versions.json
+++ b/versions.json
@@ -383,8 +383,8 @@
     "variants": [
       "bookworm",
       "bullseye",
+      "alpine3.20",
       "alpine3.19",
-      "alpine3.18",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809",
       "windows/nanoserver-ltsc2022",
@@ -775,8 +775,8 @@
     "variants": [
       "bookworm",
       "bullseye",
+      "alpine3.20",
       "alpine3.19",
-      "alpine3.18",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809",
       "windows/nanoserver-ltsc2022",
diff --git a/versions.sh b/versions.sh
index 096a145c..a41ab467 100755
--- a/versions.sh
+++ b/versions.sh
@@ -155,8 +155,8 @@ for version in "${versions[@]}"; do
 			"bookworm",
 			"bullseye",
 			(
+				"3.20",
 				"3.19",
-				"3.18",
 				empty
 			| "alpine" + .),
 			if .arches | has("windows-amd64") and .["windows-amd64"].url then