From db212908ec25bbd21300ab3319f4ca85a2aa2eff Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 10 Oct 2024 19:57:54 +0200
Subject: [PATCH] Upgrade golang and baseimage

---
 Changelog.md | 2 ++
 Dockerfile   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1c29183a..ba2808d7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,8 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v17.4.2
 - gitaly: upgrade to v17.4.2
 - gitlab-pages: upgrade to v17.4.2
+- golang: upgrade to v1.23.2
+- ubuntu: upgrade to focal-20240918
 
 **17.4.1**
 
diff --git a/Dockerfile b/Dockerfile
index 95f7f1e9..1d1ed93c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20240530
+FROM ubuntu:focal-20240918
 
 ARG VERSION=17.4.2
 
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
     RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.23.1 \
+    GOLANG_VERSION=1.23.2 \
     GITLAB_SHELL_VERSION=14.39.0 \
     GITLAB_PAGES_VERSION=17.4.2 \
     GITALY_SERVER_VERSION=17.4.2 \