From ee0144185f7719aef4249104f3488a14da06f275 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Thu, 14 Mar 2024 19:21:48 +0300
Subject: [PATCH] Pull request 2175: split-snap-docker

Squashed commit of the following:

commit 895f50c3c811a3f4d5b9d514f4b24129db104b1f
Merge: 5bd2edd06 4e3b53f1b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 14 19:11:32 2024 +0300

    Merge branch 'master' into split-snap-docker

commit 5bd2edd06bc359b4eb9cdde6309a256945830248
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 14 19:00:06 2024 +0300

    bamboo-specs: split snap docker, use go-builder
---
 bamboo-specs/release.yaml   | 12 ++++++++----
 bamboo-specs/snapcraft.yaml | 12 ++++++------
 bamboo-specs/test.yaml      |  5 +++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index b6ba76ed..56746e82 100644
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,7 +7,9 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
-    'dockerGo': 'adguard/golang-ubuntu:8.1'
+    # TODO(a.garipov): Split away the frontend image.
+    'dockerFrontend': 'adguard/golang-ubuntu:9.0'
+    'dockerGo': 'adguard/go-builder:1.21.8--1'
 
 'stages':
   - 'Build frontend':
@@ -44,7 +46,7 @@
 # performed.
 'Build frontend':
     'docker':
-        'image': '${bamboo.dockerGo}'
+        'image': '${bamboo.dockerFrontend}'
         'volumes':
             '${system.YARN_DIR}': '${bamboo.cacheYarn}'
     'key': 'BF'
@@ -274,7 +276,8 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:8.1'
+            'dockerFrontend': 'adguard/golang-ubuntu:9.0'
+            'dockerGo': 'adguard/go-builder:1.21.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]+':
@@ -289,4 +292,5 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:8.1'
+            'dockerFrontend': 'adguard/golang-ubuntu:9.0'
+            'dockerGo': 'adguard/go-builder:1.21.8--1'
diff --git a/bamboo-specs/snapcraft.yaml b/bamboo-specs/snapcraft.yaml
index bbf2b271..d8fa272e 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.1'
+    'dockerSnap': 'adguard/snap-builder:1.0'
     'snapcraftChannel': 'edge'
 
 'stages':
@@ -53,7 +53,7 @@
         'shared': true
         'required': true
     'docker':
-        'image': '${bamboo.dockerGo}'
+        'image': '${bamboo.dockerSnap}'
     'key': 'DR'
     'other':
         'clean-working-dir': true
@@ -99,7 +99,7 @@
         'shared': true
         'required': true
     'docker':
-        'image': '${bamboo.dockerGo}'
+        'image': '${bamboo.dockerSnap}'
     'key': 'BP'
     'other':
         'clean-working-dir': true
@@ -127,7 +127,7 @@
       - 'artifact': 'armhf_snap'
       - 'artifact': 'arm64_snap'
     'docker':
-        'image': '${bamboo.dockerGo}'
+        'image': '${bamboo.dockerSnap}'
     'key': 'PTS'
     'other':
         'clean-working-dir': true
@@ -191,7 +191,7 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:8.1'
+            'dockerSnap': 'adguard/snap-builder:1.0'
             '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.1'
+            'dockerSnap': 'adguard/snap-builder:1.0'
             'snapcraftChannel': 'candidate'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index c65c8052..d56bce8d 100644
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,8 @@
     'key': 'AHBRTSPECS'
     'name': 'AdGuard Home - Build and run tests'
 'variables':
-    'dockerGo': 'adguard/golang-ubuntu:8.1'
+    # TODO(a.garipov): Split away the frontend image and stages.
+    'dockerGo': 'adguard/golang-ubuntu:9.0'
     'channel': 'development'
 
 'stages':
@@ -122,5 +123,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.1'
+            'dockerGo': 'adguard/golang-ubuntu:9.0'
             'channel': 'candidate'