From d94940820f6b2d0c659969068b8df756d0160dad Mon Sep 17 00:00:00 2001
From: Amber Brown <ambrown@redhat.com>
Date: Fri, 8 Sep 2023 14:31:52 +1000
Subject: [PATCH] update to go 1.18.10

---
 Dockerfile.aro-e2e                   | 2 +-
 Dockerfile.aro-multistage            | 2 +-
 Dockerfile.ci                        | 6 +++---
 Dockerfile.proxy                     | 2 +-
 pkg/containerinstall/install_test.go | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.aro-e2e b/Dockerfile.aro-e2e
index b6e29f87f88..6298da4f6b8 100644
--- a/Dockerfile.aro-e2e
+++ b/Dockerfile.aro-e2e
@@ -1,7 +1,7 @@
 # Uses a multi-stage container build to build the RP & E2E components.
 #
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.18.4 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder
 ENV GOOS=linux \
     GOPATH=/go/
 WORKDIR ${GOPATH}/src/github.com/Azure/ARO-RP
diff --git a/Dockerfile.aro-multistage b/Dockerfile.aro-multistage
index 3dad435303f..80720d76385 100644
--- a/Dockerfile.aro-multistage
+++ b/Dockerfile.aro-multistage
@@ -1,7 +1,7 @@
 # Uses a multi-stage container build to build the RP.
 #
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.18.4 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder
 ENV GOOS=linux \
     GOPATH=/go/
 WORKDIR ${GOPATH}/src/github.com/Azure/ARO-RP
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 5df6827de9b..40b757b13ff 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,8 +1,8 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:1.18.4 
+FROM registry.access.redhat.com/ubi8/go-toolset:1.18.10
 
 USER root
-RUN mkdir -p /root/go/src/github.com/Azure/ARO-RP 
-WORKDIR /root/go/src/github.com/Azure/ARO-RP 
+RUN mkdir -p /root/go/src/github.com/Azure/ARO-RP
+WORKDIR /root/go/src/github.com/Azure/ARO-RP
 ENV GOPATH=/root/go
 
 #we have multiple steps for copy so we can make use of caching
diff --git a/Dockerfile.proxy b/Dockerfile.proxy
index 9ad9696d7b2..aef34c33972 100644
--- a/Dockerfile.proxy
+++ b/Dockerfile.proxy
@@ -1,7 +1,7 @@
 # Uses a multi-stage container build to build the proxy
 #
 ARG REGISTRY
-FROM ${REGISTRY}/ubi8/go-toolset:1.18.4 AS builder
+FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder
 ENV GOOS=linux \
     GOPATH=/go/
 WORKDIR ${GOPATH}/src/github.com/Azure/ARO-RP
diff --git a/pkg/containerinstall/install_test.go b/pkg/containerinstall/install_test.go
index cda6719b13f..d72f95c5719 100644
--- a/pkg/containerinstall/install_test.go
+++ b/pkg/containerinstall/install_test.go
@@ -27,7 +27,7 @@ import (
 	testlog "github.com/Azure/ARO-RP/test/util/log"
 )
 
-const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.18.4"
+const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.18.10"
 
 var _ = Describe("Podman", Ordered, func() {
 	var err error