From 5565b9e1c1ebf0459f917614fa01741467a61604 Mon Sep 17 00:00:00 2001
From: Eugene Burkov <e.burkov@adguard.com>
Date: Wed, 6 Mar 2024 16:12:40 +0300
Subject: [PATCH] Pull request 2161: Upd Go

Squashed commit of the following:

commit 304703195e66e935a5900b07d1cefea262a4689d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 15:42:57 2024 +0300

    all: log changes better

commit c47f31ac7f6be6d5bada670065f20c32b0bd29e9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 15:33:19 2024 +0300

    bamboo-specs: upd img

commit 5286ca1afe2c04e9b1d0b55bcbcd02d462947e8c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 14:59:18 2024 +0300

    tools: upd go

commit fd5e94f0d4afadbf48deab1cee4ee23f82f1bd0f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 14:11:05 2024 +0300

    all: upd go
---
 .github/workflows/build.yml | 2 +-
 .github/workflows/lint.yml  | 2 +-
 CHANGELOG.md                | 3 ++-
 Makefile                    | 2 +-
 bamboo-specs/release.yaml   | 6 +++---
 bamboo-specs/snapcraft.yaml | 6 +++---
 bamboo-specs/test.yaml      | 4 ++--
 go.mod                      | 2 +-
 internal/tools/go.mod       | 2 +-
 9 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3cb7c40..f140346b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.21.7'
+  'GO_VERSION': '1.21.8'
   'NODE_VERSION': '16'
 
 'on':
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b418e66f..ebbe80ef 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.21.7'
+  'GO_VERSION': '1.21.8'
 
 'on':
   'push':
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b140624..32c2ce9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
 ### Security
 
 - Go version has been updated to prevent the possibility of exploiting the Go
-  vulnerabilities fixed in Go 1.21.6 and Go 1.21.7.
+  vulnerabilities fixed in [Go 1.21.8][go-1.21.8].
 
 ### Added
 
@@ -74,6 +74,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
 [#6711]: https://github.com/AdguardTeam/AdGuardHome/issues/6711
 
 [go-toolchain]: https://go.dev/blog/toolchain
+[go-1.21.8]:    https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg
 
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
diff --git a/Makefile b/Makefile
index 2ec8699b..8fccfc35 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ DIST_DIR = dist
 GOAMD64 = v1
 GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
 GOSUMDB = sum.golang.google.cn
-GOTOOLCHAIN = go1.21.7
+GOTOOLCHAIN = go1.21.8
 GPG_KEY = devteam@adguard.com
 GPG_KEY_PASSPHRASE = not-a-real-password
 NPM = npm
diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index 5ca3ac56..26d39c8f 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:8.0'
+    'dockerGo': 'adguard/golang-ubuntu:8.1'
 
 'stages':
   - 'Build frontend':
@@ -272,7 +272,7 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:8.0'
+            'dockerGo': 'adguard/golang-ubuntu:8.1'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
   - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -287,4 +287,4 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:8.0'
+            'dockerGo': 'adguard/golang-ubuntu:8.1'
diff --git a/bamboo-specs/snapcraft.yaml b/bamboo-specs/snapcraft.yaml
index 06f85937..bbf2b271 100644
--- a/bamboo-specs/snapcraft.yaml
+++ b/bamboo-specs/snapcraft.yaml
@@ -10,7 +10,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
-    'dockerGo': 'adguard/golang-ubuntu:8.0'
+    'dockerGo': 'adguard/golang-ubuntu:8.1'
     'snapcraftChannel': 'edge'
 
 'stages':
@@ -191,7 +191,7 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:8.0'
+            'dockerGo': 'adguard/golang-ubuntu:8.1'
             'snapcraftChannel': 'beta'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
@@ -207,5 +207,5 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:8.0'
+            'dockerGo': 'adguard/golang-ubuntu:8.1'
             'snapcraftChannel': 'candidate'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index 532e7f4b..b27817df 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:8.0'
+    'dockerGo': 'adguard/golang-ubuntu:8.1'
     'channel': 'development'
 
 'stages':
@@ -127,5 +127,5 @@
         # Set the default release channel on the release branch to beta, as we
         # may need to build a few of these.
         'variables':
-            'dockerGo': 'adguard/golang-ubuntu:8.0'
+            'dockerGo': 'adguard/golang-ubuntu:8.1'
             'channel': 'candidate'
diff --git a/go.mod b/go.mod
index 537a6e76..b9c6330e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/AdguardTeam/AdGuardHome
 
-go 1.21.7
+go 1.21.8
 
 require (
 	github.com/AdguardTeam/dnsproxy v0.65.2
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
index 50a029e2..1d6c288e 100644
--- a/internal/tools/go.mod
+++ b/internal/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/AdguardTeam/AdGuardHome/internal/tools
 
-go 1.21.7
+go 1.21.8
 
 require (
 	github.com/fzipp/gocyclo v0.6.0