From 18079ca1bbf0e92f0cae3b2a179321bf3f232a54 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Fri, 11 Feb 2022 16:30:09 +0300
Subject: [PATCH] Pull request: all: upd go

Merge in DNS/adguard-home from upd-go to master

Squashed commit of the following:

commit 5540d0afd7579a2f2d543afaa96008d12ce1bf3e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Feb 11 16:15:35 2022 +0300

    all: upd go
---
 .gitattributes            | 4 ++++
 bamboo-specs/release.yaml | 6 +++---
 bamboo-specs/test.yaml    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index b2b017bd..825a99ca 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,5 @@
 client/* linguist-vendored
+# This file contains a lot of inline SVG data, which often interferes with
+# grepping.  Technically, this file must be reviewed when new icons appear, but
+# that happens fairly rarely.
+client/src/components/ui/Icons.js -diff
diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index 754bfa9d..796d874d 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:4.0'
+  'dockerGo': 'adguard/golang-ubuntu:4.1'
 
 'stages':
 - 'Make release':
@@ -266,7 +266,7 @@
     # need to build a few of these.
     'variables':
       'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:4.0'
+      'dockerGo': 'adguard/golang-ubuntu:4.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]+':
@@ -281,4 +281,4 @@
     # are the ones that actually get released.
     'variables':
       'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:4.0'
+      'dockerGo': 'adguard/golang-ubuntu:4.1'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index c6a2ffee..e41f172f 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:4.0'
+  'dockerGo': 'adguard/golang-ubuntu:4.1'
 
 'stages':
 - 'Tests':