From 2eec1ba7600bb4af937a46ecd6a097376e6cc000 Mon Sep 17 00:00:00 2001
From: Frank Viernau <frank_viernau@epam.com>
Date: Fri, 5 Apr 2024 14:36:55 +0200
Subject: [PATCH] revert(docker): Revert Revert "Upgrade Go to version 1.22.0"

The upgrade has been reverted because it broke the fun tests for
`GoDep`. The removal of `GoDep`, in a preceeding change, has unblocked
upgrading Go. So, revert that to finally do the upgrade.

This reverts commit 58332a056034fc52bd8063d2dd007981ee84c6d8.

Fixes: #8443.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
---
 .versions         | 2 +-
 Dockerfile        | 2 +-
 Dockerfile-legacy | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index ca605cca70c1d..e676ca6153666 100644
--- a/.versions
+++ b/.versions
@@ -8,7 +8,7 @@ COMPOSER_VERSION=2.2
 CONAN_VERSION=1.63.0
 DART_VERSION=2.18.4
 DOTNET_VERSION=6.0
-GO_VERSION=1.21.6
+GO_VERSION=1.22.0
 HASKELL_STACK_VERSION=2.13.1
 JAVA_VERSION=17
 LICENSEE_VERSION=9.15.3
diff --git a/Dockerfile b/Dockerfile
index c0207496b81da..2396476cc840a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -252,7 +252,7 @@ COPY --from=rustbuild /opt/rust /opt/rust
 # GOLANG - Build as a separate component
 FROM base AS gobuild
 
-ARG GO_VERSION=1.21.6
+ARG GO_VERSION=1.22.0
 ENV GOBIN=/opt/go/bin
 ENV PATH=$PATH:/opt/go/bin
 
diff --git a/Dockerfile-legacy b/Dockerfile-legacy
index 9f9a1ef697b50..39e7dfaf7952d 100644
--- a/Dockerfile-legacy
+++ b/Dockerfile-legacy
@@ -76,7 +76,7 @@ ENV \
     COMPOSER_VERSION=2.2.6-2ubuntu4 \
     CONAN_VERSION=1.63.0 \
     DOTNET_VERSION=6.0 \
-    GO_VERSION=1.21.6 \
+    GO_VERSION=1.22.0 \
     HASKELL_STACK_VERSION=2.13.1 \
     NPM_VERSION=10.1.0 \
     PNPM_VERSION=8.10.3 \