From c28708148400d86186a80ea4d56b2cd30b497f06 Mon Sep 17 00:00:00 2001
From: Adam Chalkley <atc0005@users.noreply.github.com>
Date: Mon, 27 May 2024 06:28:27 -0500
Subject: [PATCH 1/2] Swap Alpine base image version from 3.18 to 3.20

Update base image version to reflect upstream retirement of the
3.18 image.

refs GH-1541
---
 oldstable/build/alpine-x64/Dockerfile | 2 +-
 oldstable/build/alpine-x86/Dockerfile | 2 +-
 stable/build/alpine-x64/Dockerfile    | 2 +-
 stable/build/alpine-x86/Dockerfile    | 2 +-
 unstable/build/alpine-x64/Dockerfile  | 2 +-
 unstable/build/alpine-x86/Dockerfile  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oldstable/build/alpine-x64/Dockerfile b/oldstable/build/alpine-x64/Dockerfile
index 229e9477..1a835c0b 100644
--- a/oldstable/build/alpine-x64/Dockerfile
+++ b/oldstable/build/alpine-x64/Dockerfile
@@ -7,7 +7,7 @@
 
 # https://hub.docker.com/_/golang
 
-FROM amd64/golang:1.21.10-alpine3.18
+FROM amd64/golang:1.21.10-alpine3.20
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
 LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"
diff --git a/oldstable/build/alpine-x86/Dockerfile b/oldstable/build/alpine-x86/Dockerfile
index 28224e9d..52a3d4c6 100644
--- a/oldstable/build/alpine-x86/Dockerfile
+++ b/oldstable/build/alpine-x86/Dockerfile
@@ -7,7 +7,7 @@
 
 # https://hub.docker.com/_/golang
 
-FROM i386/golang:1.21.10-alpine3.18
+FROM i386/golang:1.21.10-alpine3.20
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
 LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"
diff --git a/stable/build/alpine-x64/Dockerfile b/stable/build/alpine-x64/Dockerfile
index d32ff694..b45a6968 100644
--- a/stable/build/alpine-x64/Dockerfile
+++ b/stable/build/alpine-x64/Dockerfile
@@ -7,7 +7,7 @@
 
 # https://hub.docker.com/_/golang
 
-FROM amd64/golang:1.22.3-alpine3.18
+FROM amd64/golang:1.22.3-alpine3.20
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
 LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"
diff --git a/stable/build/alpine-x86/Dockerfile b/stable/build/alpine-x86/Dockerfile
index 02b348ad..2857a15d 100644
--- a/stable/build/alpine-x86/Dockerfile
+++ b/stable/build/alpine-x86/Dockerfile
@@ -7,7 +7,7 @@
 
 # https://hub.docker.com/_/golang
 
-FROM i386/golang:1.22.3-alpine3.18
+FROM i386/golang:1.22.3-alpine3.20
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
 LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"
diff --git a/unstable/build/alpine-x64/Dockerfile b/unstable/build/alpine-x64/Dockerfile
index 031a300d..7268924e 100644
--- a/unstable/build/alpine-x64/Dockerfile
+++ b/unstable/build/alpine-x64/Dockerfile
@@ -7,7 +7,7 @@
 
 # https://hub.docker.com/_/golang
 
-FROM amd64/golang:1.22.3-alpine3.18
+FROM amd64/golang:1.22.3-alpine3.20
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
 LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"
diff --git a/unstable/build/alpine-x86/Dockerfile b/unstable/build/alpine-x86/Dockerfile
index b7760577..b4f7b79b 100644
--- a/unstable/build/alpine-x86/Dockerfile
+++ b/unstable/build/alpine-x86/Dockerfile
@@ -7,7 +7,7 @@
 
 # https://hub.docker.com/_/golang
 
-FROM i386/golang:1.22.3-alpine3.18
+FROM i386/golang:1.22.3-alpine3.20
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
 LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"

From 9026bb7b906b275bf9af16f804a325d658d6dcce Mon Sep 17 00:00:00 2001
From: Adam Chalkley <atc0005@users.noreply.github.com>
Date: Mon, 27 May 2024 06:45:08 -0500
Subject: [PATCH 2/2] Update pinned Alpine package versions

Update packages to reflect base image version update

refs GH-1541
---
 oldstable/build/alpine-x64/Dockerfile | 22 +++++++++++-----------
 oldstable/build/alpine-x86/Dockerfile | 22 +++++++++++-----------
 stable/build/alpine-x64/Dockerfile    | 22 +++++++++++-----------
 stable/build/alpine-x86/Dockerfile    | 22 +++++++++++-----------
 unstable/build/alpine-x64/Dockerfile  | 22 +++++++++++-----------
 unstable/build/alpine-x86/Dockerfile  | 22 +++++++++++-----------
 6 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/oldstable/build/alpine-x64/Dockerfile b/oldstable/build/alpine-x64/Dockerfile
index 1a835c0b..1883e53c 100644
--- a/oldstable/build/alpine-x64/Dockerfile
+++ b/oldstable/build/alpine-x64/Dockerfile
@@ -28,18 +28,18 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-# NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION="12.2.0-r3"
+# NOTE: This version is often different than the base `gcc` package.
+ENV APK_GCC_MINGW64_VERSION="13.2.0-r2"
 
-ENV APK_BASH_VERSION="5.2.15-r5"
-ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
-ENV APK_GIT_VERSION="2.40.1-r0"
-ENV APK_MAKE_VERSION="4.4.1-r1"
-ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
-ENV APK_FILE_VERSION="5.45-r0"
-ENV APK_NANO_VERSION="7.2-r1"
-ENV APK_MUSL_DEV_VERSION="1.2.4-r2"
-ENV APK_XZ_VERSION="5.4.3-r0"
+ENV APK_BASH_VERSION="5.2.26-r0"
+ENV APK_GCC_VERSION="13.2.1_git20240309-r0"
+ENV APK_GIT_VERSION="2.45.1-r0"
+ENV APK_MAKE_VERSION="4.4.1-r2"
+ENV APK_UTIL_LINUX_VERSION="2.40.1-r1"
+ENV APK_FILE_VERSION="5.45-r1"
+ENV APK_NANO_VERSION="8.0-r0"
+ENV APK_MUSL_DEV_VERSION="1.2.5-r0"
+ENV APK_XZ_VERSION="5.6.1-r3"
 
 # https://github.com/tc-hib/go-winres/releases
 ENV GO_WINRES_VERSION="v0.3.3"
diff --git a/oldstable/build/alpine-x86/Dockerfile b/oldstable/build/alpine-x86/Dockerfile
index 52a3d4c6..b14a4bf2 100644
--- a/oldstable/build/alpine-x86/Dockerfile
+++ b/oldstable/build/alpine-x86/Dockerfile
@@ -27,18 +27,18 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-# NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION="12.2.0-r3"
+# NOTE: This version is often different than the base `gcc` package.
+ENV APK_GCC_MINGW64_VERSION="13.2.0-r2"
 
-ENV APK_BASH_VERSION="5.2.15-r5"
-ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
-ENV APK_GIT_VERSION="2.40.1-r0"
-ENV APK_MAKE_VERSION="4.4.1-r1"
-ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
-ENV APK_FILE_VERSION="5.45-r0"
-ENV APK_NANO_VERSION="7.2-r1"
-ENV APK_MUSL_DEV_VERSION="1.2.4-r2"
-ENV APK_XZ_VERSION="5.4.3-r0"
+ENV APK_BASH_VERSION="5.2.26-r0"
+ENV APK_GCC_VERSION="13.2.1_git20240309-r0"
+ENV APK_GIT_VERSION="2.45.1-r0"
+ENV APK_MAKE_VERSION="4.4.1-r2"
+ENV APK_UTIL_LINUX_VERSION="2.40.1-r1"
+ENV APK_FILE_VERSION="5.45-r1"
+ENV APK_NANO_VERSION="8.0-r0"
+ENV APK_MUSL_DEV_VERSION="1.2.5-r0"
+ENV APK_XZ_VERSION="5.6.1-r3"
 
 # https://github.com/tc-hib/go-winres/releases
 ENV GO_WINRES_VERSION="v0.3.3"
diff --git a/stable/build/alpine-x64/Dockerfile b/stable/build/alpine-x64/Dockerfile
index b45a6968..39f90a35 100644
--- a/stable/build/alpine-x64/Dockerfile
+++ b/stable/build/alpine-x64/Dockerfile
@@ -28,18 +28,18 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-# NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION="12.2.0-r3"
+# NOTE: This version is often different than the base `gcc` package.
+ENV APK_GCC_MINGW64_VERSION="13.2.0-r2"
 
-ENV APK_BASH_VERSION="5.2.15-r5"
-ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
-ENV APK_GIT_VERSION="2.40.1-r0"
-ENV APK_MAKE_VERSION="4.4.1-r1"
-ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
-ENV APK_FILE_VERSION="5.45-r0"
-ENV APK_NANO_VERSION="7.2-r1"
-ENV APK_MUSL_DEV_VERSION="1.2.4-r2"
-ENV APK_XZ_VERSION="5.4.3-r0"
+ENV APK_BASH_VERSION="5.2.26-r0"
+ENV APK_GCC_VERSION="13.2.1_git20240309-r0"
+ENV APK_GIT_VERSION="2.45.1-r0"
+ENV APK_MAKE_VERSION="4.4.1-r2"
+ENV APK_UTIL_LINUX_VERSION="2.40.1-r1"
+ENV APK_FILE_VERSION="5.45-r1"
+ENV APK_NANO_VERSION="8.0-r0"
+ENV APK_MUSL_DEV_VERSION="1.2.5-r0"
+ENV APK_XZ_VERSION="5.6.1-r3"
 
 # https://github.com/tc-hib/go-winres/releases
 ENV GO_WINRES_VERSION="v0.3.3"
diff --git a/stable/build/alpine-x86/Dockerfile b/stable/build/alpine-x86/Dockerfile
index 2857a15d..1454f31f 100644
--- a/stable/build/alpine-x86/Dockerfile
+++ b/stable/build/alpine-x86/Dockerfile
@@ -27,18 +27,18 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-# NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION="12.2.0-r3"
+# NOTE: This version is often different than the base `gcc` package.
+ENV APK_GCC_MINGW64_VERSION="13.2.0-r2"
 
-ENV APK_BASH_VERSION="5.2.15-r5"
-ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
-ENV APK_GIT_VERSION="2.40.1-r0"
-ENV APK_MAKE_VERSION="4.4.1-r1"
-ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
-ENV APK_FILE_VERSION="5.45-r0"
-ENV APK_NANO_VERSION="7.2-r1"
-ENV APK_MUSL_DEV_VERSION="1.2.4-r2"
-ENV APK_XZ_VERSION="5.4.3-r0"
+ENV APK_BASH_VERSION="5.2.26-r0"
+ENV APK_GCC_VERSION="13.2.1_git20240309-r0"
+ENV APK_GIT_VERSION="2.45.1-r0"
+ENV APK_MAKE_VERSION="4.4.1-r2"
+ENV APK_UTIL_LINUX_VERSION="2.40.1-r1"
+ENV APK_FILE_VERSION="5.45-r1"
+ENV APK_NANO_VERSION="8.0-r0"
+ENV APK_MUSL_DEV_VERSION="1.2.5-r0"
+ENV APK_XZ_VERSION="5.6.1-r3"
 
 # https://github.com/tc-hib/go-winres/releases
 ENV GO_WINRES_VERSION="v0.3.3"
diff --git a/unstable/build/alpine-x64/Dockerfile b/unstable/build/alpine-x64/Dockerfile
index 7268924e..54a2e759 100644
--- a/unstable/build/alpine-x64/Dockerfile
+++ b/unstable/build/alpine-x64/Dockerfile
@@ -28,18 +28,18 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-# NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION="12.2.0-r3"
+# NOTE: This version is often different than the base `gcc` package.
+ENV APK_GCC_MINGW64_VERSION="13.2.0-r2"
 
-ENV APK_BASH_VERSION="5.2.15-r5"
-ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
-ENV APK_GIT_VERSION="2.40.1-r0"
-ENV APK_MAKE_VERSION="4.4.1-r1"
-ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
-ENV APK_FILE_VERSION="5.45-r0"
-ENV APK_NANO_VERSION="7.2-r1"
-ENV APK_MUSL_DEV_VERSION="1.2.4-r2"
-ENV APK_XZ_VERSION="5.4.3-r0"
+ENV APK_BASH_VERSION="5.2.26-r0"
+ENV APK_GCC_VERSION="13.2.1_git20240309-r0"
+ENV APK_GIT_VERSION="2.45.1-r0"
+ENV APK_MAKE_VERSION="4.4.1-r2"
+ENV APK_UTIL_LINUX_VERSION="2.40.1-r1"
+ENV APK_FILE_VERSION="5.45-r1"
+ENV APK_NANO_VERSION="8.0-r0"
+ENV APK_MUSL_DEV_VERSION="1.2.5-r0"
+ENV APK_XZ_VERSION="5.6.1-r3"
 
 # https://github.com/tc-hib/go-winres/releases
 ENV GO_WINRES_VERSION="v0.3.3"
diff --git a/unstable/build/alpine-x86/Dockerfile b/unstable/build/alpine-x86/Dockerfile
index b4f7b79b..c7078805 100644
--- a/unstable/build/alpine-x86/Dockerfile
+++ b/unstable/build/alpine-x86/Dockerfile
@@ -28,18 +28,18 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
-# NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION="12.2.0-r3"
+# NOTE: This version is often different than the base `gcc` package.
+ENV APK_GCC_MINGW64_VERSION="13.2.0-r2"
 
-ENV APK_BASH_VERSION="5.2.15-r5"
-ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
-ENV APK_GIT_VERSION="2.40.1-r0"
-ENV APK_MAKE_VERSION="4.4.1-r1"
-ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
-ENV APK_FILE_VERSION="5.45-r0"
-ENV APK_NANO_VERSION="7.2-r1"
-ENV APK_MUSL_DEV_VERSION="1.2.4-r2"
-ENV APK_XZ_VERSION="5.4.3-r0"
+ENV APK_BASH_VERSION="5.2.26-r0"
+ENV APK_GCC_VERSION="13.2.1_git20240309-r0"
+ENV APK_GIT_VERSION="2.45.1-r0"
+ENV APK_MAKE_VERSION="4.4.1-r2"
+ENV APK_UTIL_LINUX_VERSION="2.40.1-r1"
+ENV APK_FILE_VERSION="5.45-r1"
+ENV APK_NANO_VERSION="8.0-r0"
+ENV APK_MUSL_DEV_VERSION="1.2.5-r0"
+ENV APK_XZ_VERSION="5.6.1-r3"
 
 # https://github.com/tc-hib/go-winres/releases
 ENV GO_WINRES_VERSION="v0.3.3"