From fc64e0089e40613541f88555504f76d6936cdcad Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Mon, 22 May 2023 16:34:41 +0300
Subject: [PATCH] Pull request 1850: upd-golang-ubuntu

Merge in DNS/adguard-home from upd-golang-ubuntu to master

Squashed commit of the following:

commit d4c79a1ddbf732f2d8500830b9f53f547ce33f23
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon May 22 16:29:48 2023 +0300

    all: upd golang-ubuntu
---
 bamboo-specs/release.yaml | 6 +++---
 bamboo-specs/test.yaml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index e394b03c..059c3805 100644
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
   'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:6.3'
+  'dockerGo': 'adguard/golang-ubuntu:6.5'
 
 'stages':
 - 'Build frontend':
@@ -330,7 +330,7 @@
     # need to build a few of these.
     'variables':
       'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:6.3'
+      'dockerGo': 'adguard/golang-ubuntu:6.5'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -345,4 +345,4 @@
     # are the ones that actually get released.
     'variables':
       'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:6.3'
+      'dockerGo': 'adguard/golang-ubuntu:6.5'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index 4a54c980..b06ebead 100644
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@
   'key': 'AHBRTSPECS'
   'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:6.3'
+  'dockerGo': 'adguard/golang-ubuntu:6.5'
 
 'stages':
 - 'Tests':