daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request 2388: 7588-upd-docker

Browse Source 
Updates #7588.

Squashed commit of the following:

commit ce282e4e079e0d18e2acf0fe412c849dfe8ce8d6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 10 19:31:52 2025 +0300

    scripts: imp build-docker

commit 054fa74d4fe3951129d43e524f713bab610ad86e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 10 17:24:01 2025 +0300

    all: upd base docker
This commit is contained in:
Ainar Garipov
2025-04-10 20:01:14 +03:00
parent 1cc6c00e4b
commit 6a99c39d11
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -22,6 +22,10 @@ NOTE: Add new changes BELOW THIS COMMENT.
- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.24.2][go-1.24.2]. - 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 ### Deprecated
- Node 20 support, Node 22 will be required in future releases. - Node 20 support, Node 22 will be required in future releases.
@@ -38,6 +42,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
- Node 18 support. - Node 18 support.
[#7588]: https://github.com/AdguardTeam/AdGuardHome/issues/7588
[#7734]: https://github.com/AdguardTeam/AdGuardHome/issues/7734 [#7734]: https://github.com/AdguardTeam/AdGuardHome/issues/7734
[go-1.24.2]: https://groups.google.com/g/golang-announce/c/Y2uBTVKjBQk [go-1.24.2]: https://groups.google.com/g/golang-announce/c/Y2uBTVKjBQk

19
docker/Dockerfile
View File

@@ -1,12 +1,12 @@
# A docker file for scripts/make/build-docker.sh. # A docker file for scripts/make/build-docker.sh.
FROM alpine:3.18 FROM alpine:3.21
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG VCS_REF ARG VCS_REF
LABEL\ LABEL \
maintainer="AdGuard Team <devteam@adguard.com>" \ maintainer="AdGuard Team <devteam@adguard.com>" \
org.opencontainers.image.authors="AdGuard Team <devteam@adguard.com>" \ org.opencontainers.image.authors="AdGuard Team <devteam@adguard.com>" \
org.opencontainers.image.created=$BUILD_DATE \ org.opencontainers.image.created=$BUILD_DATE \
@@ -30,8 +30,8 @@ ARG TARGETARCH
ARG TARGETOS ARG TARGETOS
ARG TARGETVARIANT ARG TARGETVARIANT
COPY --chown=nobody:nogroup\ COPY --chown=nobody:nogroup \
./${DIST_DIR}/docker/AdGuardHome_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT}\ ./${DIST_DIR}/docker/AdGuardHome_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT} \
/opt/adguardhome/AdGuardHome /opt/adguardhome/AdGuardHome
RUN setcap 'cap_net_bind_service=+eip' /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) # 3000 : TCP, UDP : HTTP(S) (alt, incl. HTTP/3)
# 5443 : TCP, UDP : DNSCrypt (alt) # 5443 : TCP, UDP : DNSCrypt (alt)
# 6060 : TCP : HTTP (pprof) # 6060 : TCP : HTTP (pprof)
EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 853/tcp\ EXPOSE 53/tcp 53/udp \
853/udp 3000/tcp 3000/udp 5443/tcp 5443/udp 6060/tcp 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 WORKDIR /opt/adguardhome/work

2
scripts/make/build-docker.sh
View File

@@ -117,6 +117,8 @@ $sudo_cmd docker "$debug_flags" \
--build-arg DIST_DIR="$dist_dir" \ --build-arg DIST_DIR="$dist_dir" \
--build-arg VCS_REF="$commit" \ --build-arg VCS_REF="$commit" \
--build-arg VERSION="$version" \ --build-arg VERSION="$version" \
--debug \
--output "$docker_output" \ --output "$docker_output" \
--platform "$docker_platforms" \ --platform "$docker_platforms" \
--progress 'plain' \
$docker_version_tag $docker_channel_tag -f ./docker/Dockerfile . $docker_version_tag $docker_channel_tag -f ./docker/Dockerfile .