From 7b8ac01fc2f8b5969642ec36a68de3ca5c94d9d0 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed, 5 Jun 2024 19:57:31 +0300
Subject: [PATCH] all: upd node docker
---
CHANGELOG.md | 3 +--
bamboo-specs/release.yaml | 6 +++---
bamboo-specs/test.yaml | 4 ++--
docker/Dockerfile | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91259802..96aef6f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,8 +30,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
### Changed
-- Frontend rewritten in TypeScript
-
+- Frontend rewritten in TypeScript.
- The HTTP server's write timeout has been increased from 1 minute to 5 minutes
to match the one used by AdGuard Home's HTTP client to fetch filtering-list
data ([#7041]).
diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index 174b5312..127b0d4a 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'
- 'dockerFrontend': 'adguard/home-js-builder:1.1'
+ 'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.4--1'
'stages':
@@ -265,7 +265,7 @@
# need to build a few of these.
'variables':
'channel': 'beta'
- 'dockerFrontend': 'adguard/home-js-builder:1.1'
+ 'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.4--1'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
@@ -281,5 +281,5 @@
# are the ones that actually get released.
'variables':
'channel': 'release'
- 'dockerFrontend': 'adguard/home-js-builder:1.1'
+ 'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.4--1'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index fd3a1c4b..7bb46ea7 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':
- 'dockerFrontend': 'adguard/home-js-builder:1.1'
+ 'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.4--1'
'channel': 'development'
@@ -194,6 +194,6 @@
# Set the default release channel on the release branch to beta, as we
# may need to build a few of these.
'variables':
- 'dockerFrontend': 'adguard/home-js-builder:1.1'
+ 'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.4--1'
'channel': 'candidate'
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 582af6dd..38198aa6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
# A docker file for scripts/make/build-docker.sh.
-FROM alpine:latest
+FROM alpine:3.18
ARG BUILD_DATE
ARG VERSION