Pull request: all: upd golang-ubuntu image version

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

Squashed commit of the following:

commit 67874bad7e018d6d17dc4f000aef79a5a430b994
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Oct 11 15:32:39 2021 +0300

    all: upd golang-ubuntu image version
This commit is contained in:
Ainar Garipov 2021-10-11 15:56:22 +03:00
parent da45eabc31
commit adec2c998b
2 changed files with 4 additions and 4 deletions

View File

@ -7,7 +7,7 @@
# Make sure to sync any changes with the branch overrides below. # Make sure to sync any changes with the branch overrides below.
'variables': 'variables':
'channel': 'edge' 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:3.3' 'dockerGo': 'adguard/golang-ubuntu:3.6'
'stages': 'stages':
- 'Make release': - 'Make release':
@ -266,7 +266,7 @@
# need to build a few of these. # need to build a few of these.
'variables': 'variables':
'channel': 'beta' 'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:3.3' 'dockerGo': 'adguard/golang-ubuntu:3.6'
# release-vX.Y.Z branches are the branches from which the actual final release # release-vX.Y.Z branches are the branches from which the actual final release
# is built. # is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+': - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@ -276,4 +276,4 @@
# are the ones that actually get released. # are the ones that actually get released.
'variables': 'variables':
'channel': 'release' 'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:3.3' 'dockerGo': 'adguard/golang-ubuntu:3.6'

View File

@ -5,7 +5,7 @@
'key': 'AHBRTSPECS' 'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' 'name': 'AdGuard Home - Build and run tests'
'variables': 'variables':
'dockerGo': 'adguard/golang-ubuntu:3.3' 'dockerGo': 'adguard/golang-ubuntu:3.6'
'stages': 'stages':
- 'Tests': - 'Tests':