Skip to content

Commit

Permalink
all: upd docker
Browse files Browse the repository at this point in the history
  • Loading branch information
ainar-g committed Apr 3, 2024
1 parent 6fff1f8 commit 483b77a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Run `make init` to prepare the development environment.

You will need this to build AdGuard Home:

- [Go](https://golang.org/dl/) v1.20 or later;
- [Go](https://golang.org/dl/) v1.22 or later;
- [Node.js](https://nodejs.org/en/download/) v16 or later;
- [npm](https://www.npmjs.com/) v8 or later;
- [yarn](https://yarnpkg.com/) v1.22.5 or later.
Expand Down
8 changes: 3 additions & 5 deletions bamboo-specs/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
'variables':
'channel': 'edge'
'dockerFrontend': 'adguard/home-js-builder:1.1'
# TODO(a.garipov): Update to a newer release when ready to not download it
# with the GOTOOLCHAIN mechanism.
'dockerGo': 'adguard/go-builder:1.21.8--1'
'dockerGo': 'adguard/go-builder:1.22.2--1'

'stages':
- 'Build frontend':
Expand Down Expand Up @@ -268,7 +266,7 @@
'variables':
'channel': 'beta'
'dockerFrontend': 'adguard/home-js-builder:1.1'
'dockerGo': 'adguard/go-builder:1.21.8--1'
'dockerGo': 'adguard/go-builder:1.22.2--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]+':
Expand All @@ -284,4 +282,4 @@
'variables':
'channel': 'release'
'dockerFrontend': 'adguard/home-js-builder:1.1'
'dockerGo': 'adguard/go-builder:1.21.8--1'
'dockerGo': 'adguard/go-builder:1.22.2--1'
4 changes: 2 additions & 2 deletions bamboo-specs/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'name': 'AdGuard Home - Build and run tests'
'variables':
'dockerFrontend': 'adguard/home-js-builder:1.1'
'dockerGo': 'adguard/go-builder:1.21.8--1'
'dockerGo': 'adguard/go-builder:1.22.2--1'
'channel': 'development'

'stages':
Expand Down Expand Up @@ -195,5 +195,5 @@
# may need to build a few of these.
'variables':
'dockerFrontend': 'adguard/home-js-builder:1.1'
'dockerGo': 'adguard/go-builder:1.21.8--1'
'dockerGo': 'adguard/go-builder:1.22.2--1'
'channel': 'candidate'

0 comments on commit 483b77a

Please sign in to comment.