From 39e22ada960019c1996f4c61aabe2cc089a08399 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu, 10 Apr 2025 20:35:55 +0300
Subject: [PATCH] all: upd base docker

---
 CHANGELOG.md                 |  7 ++++++-
 bamboo-specs/release.yaml    |  1 +
 docker/Dockerfile            | 19 +++++++++++++------
 scripts/make/build-docker.sh |  1 +
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90dd27e5..83d53617 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
 NOTE: Add new changes ABOVE THIS COMMENT.
 -->
 
-## [v0.107.60] - 2025-04-09
+## [v0.107.60] - 2025-04-14
 
 See also the [v0.107.60 GitHub milestone][ms-v0.107.60].
 
@@ -29,6 +29,10 @@ See also the [v0.107.60 GitHub milestone][ms-v0.107.60].
 
 - Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.24.2][go-1.24.2].
 
+### Changed
+
+- Alpine Linux version in `Dockerfile` has been updated to 3.21 ([#7588]).
+
 ### Deprecated
 
 - Node 20 support, Node 22 will be required in future releases.
@@ -47,6 +51,7 @@ See also the [v0.107.60 GitHub milestone][ms-v0.107.60].
 
 - Node 18 support.
 
+[#7588]: https://github.com/AdguardTeam/AdGuardHome/issues/7588
 [#7729]: https://github.com/AdguardTeam/AdGuardHome/issues/7729
 [#7734]: https://github.com/AdguardTeam/AdGuardHome/issues/7734
 
diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index a0af75f2..95155593 100644
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -157,6 +157,7 @@
 
                 # Print Docker info.
                 docker info
+                docker buildx version
 
                 # Prepare and push the build.
                 env \
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 38198aa6..81331e05 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,12 @@
 # A docker file for scripts/make/build-docker.sh.
 
-FROM alpine:3.18
+FROM alpine:3.21
 
 ARG BUILD_DATE
 ARG VERSION
 ARG VCS_REF
 
-LABEL\
+LABEL \
 	maintainer="AdGuard Team <devteam@adguard.com>" \
 	org.opencontainers.image.authors="AdGuard Team <devteam@adguard.com>" \
 	org.opencontainers.image.created=$BUILD_DATE \
@@ -30,8 +30,8 @@ ARG TARGETARCH
 ARG TARGETOS
 ARG TARGETVARIANT
 
-COPY --chown=nobody:nogroup\
-	./${DIST_DIR}/docker/AdGuardHome_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT}\
+COPY --chown=nobody:nogroup \
+	./${DIST_DIR}/docker/AdGuardHome_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT} \
 	/opt/adguardhome/AdGuardHome
 
 RUN setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome
@@ -45,8 +45,15 @@ RUN setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome
 # 3000   : TCP, UDP : HTTP(S) (alt, incl. HTTP/3)
 # 5443   : TCP, UDP : DNSCrypt (alt)
 # 6060   : TCP      : HTTP (pprof)
-EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 853/tcp\
-	853/udp 3000/tcp 3000/udp 5443/tcp 5443/udp 6060/tcp
+EXPOSE 53/tcp 53/udp \
+	67/udp \
+	68/udp \
+	80/tcp \
+	443/tcp 443/udp \
+	853/tcp 853/udp \
+	3000/tcp 3000/udp \
+	5443/tcp 5443/udp \
+	6060/tcp
 
 WORKDIR /opt/adguardhome/work
 
diff --git a/scripts/make/build-docker.sh b/scripts/make/build-docker.sh
index c998b3f7..79ad3c81 100644
--- a/scripts/make/build-docker.sh
+++ b/scripts/make/build-docker.sh
@@ -119,4 +119,5 @@ $sudo_cmd docker "$debug_flags" \
 	--build-arg VERSION="$version" \
 	--output "$docker_output" \
 	--platform "$docker_platforms" \
+	--progress 'plain' \
 	$docker_version_tag $docker_channel_tag -f ./docker/Dockerfile .