From b1036a9dc850e8b160f0308665fd1843db0818e3 Mon Sep 17 00:00:00 2001
From: HDYA-BackFire <chuhua@microsoft.com>
Date: Tue, 28 Jan 2025 07:20:22 +1100
Subject: [PATCH] [chore][golang] bump golang to 1.23.5 for security patches
 (#2025)

---
 Dockerfile.test                | 2 +-
 Makefile                       | 2 +-
 appveyor.yml                   | 2 +-
 cmd/proxy/Dockerfile           | 2 +-
 docker-compose.yml             | 6 +++---
 go.mod                         | 2 +-
 scripts/build-image/Dockerfile | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 2a00e47e..346fb6f9 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.23.4
+ARG GOLANG_VERSION=1.23.5
 FROM golang:$GOLANG_VERSION
 
 RUN echo $GOLANG_VERSION
diff --git a/Makefile b/Makefile
index 66705473..9309729f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z)
 GOLANGCI_LINT_VERSION=v1.61.0
 
 ifndef GOLANG_VERSION
-override GOLANG_VERSION = 1.23.4
+override GOLANG_VERSION = 1.23.5
 endif
 
 .PHONY: build
diff --git a/appveyor.yml b/appveyor.yml
index 9f152cbb..6310c2db 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ environment:
   GOPROXY: https://proxy.golang.org
   SKIP_UNTIL_113: true
 
-stack: go 1.23.4
+stack: go 1.23.5
 
 test_script:
   - go version
diff --git a/cmd/proxy/Dockerfile b/cmd/proxy/Dockerfile
index 18509a30..ad53e3a9 100644
--- a/cmd/proxy/Dockerfile
+++ b/cmd/proxy/Dockerfile
@@ -5,7 +5,7 @@
 # You can override the Go version used to build the image.
 # See project Makefile if using make.
 # See docker --build-arg if building directly.
-ARG GOLANG_VERSION=1.23.4
+ARG GOLANG_VERSION=1.23.5
 ARG ALPINE_VERSION=3.20
 
 FROM golang:${GOLANG_VERSION}-alpine AS builder
diff --git a/docker-compose.yml b/docker-compose.yml
index 28599618..cb96a52b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: .
       dockerfile: cmd/proxy/Dockerfile
       args:
-        GOLANG_VERSION: "1.23.4"
+        GOLANG_VERSION: "1.23.5"
     environment:
       - ATHENS_MONGO_STORAGE_URL=mongodb://mongo:27017
       - TIMEOUT=20 # in case the mongo dependency takes longer to start up
@@ -20,7 +20,7 @@ services:
       context: .
       dockerfile: Dockerfile.test
       args:
-        GOLANG_VERSION: "1.23.4"
+        GOLANG_VERSION: "1.23.5"
     command: ["./scripts/test_unit.sh"]
     environment:
       - GO_ENV=test
@@ -36,7 +36,7 @@ services:
       context: .
       dockerfile: Dockerfile.test
       args:
-        GOLANG_VERSION: "1.23.4"
+        GOLANG_VERSION: "1.23.5"
     command: ["./scripts/test_e2e.sh"]
   azurite:
     image: arafato/azurite:2.6.5
diff --git a/go.mod b/go.mod
index 43b3fe2a..4088192c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/gomods/athens
 
-go 1.23.4
+go 1.23.5
 
 require (
 	cloud.google.com/go/storage v1.45.0
diff --git a/scripts/build-image/Dockerfile b/scripts/build-image/Dockerfile
index 9a60cb1e..1e72810d 100644
--- a/scripts/build-image/Dockerfile
+++ b/scripts/build-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.4-bookworm
+FROM golang:1.23.5-bookworm
 
 WORKDIR /tmp