mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request 1900: fix-docker-script 

Closes #5947.

Squashed commit of the following:

commit 309fab7afd78585a561830379f06dd531e6f260e
Merge: 31a6a577d ad1bf5cf6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jun 30 10:43:36 2023 +0300

    Merge branch 'master' into fix-docker-script

commit 31a6a577ddd2ae8f6a27f852f655628333f8e3da
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jun 29 21:48:37 2023 +0300

    scripts: fix unbound variable

commit 59b2bb836a11b2f2719d5c5a9bf5d025736d4435
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jun 29 21:12:37 2023 +0300

    scripts: fix docker
This commit is contained in:
Ainar Garipov 2023-06-30 10:47:44 +03:00
parent ad1bf5cf6e
commit efed23701a
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,21 +62,22 @@ readonly docker_output
case "$channel" case "$channel"
in in
('release') ('release')
docker_version_tag="${docker_image_name}:${version}" docker_version_tag="--tag=${docker_image_name}:${version}"
docker_channel_tag="${docker_image_name}:latest" docker_channel_tag="--tag=${docker_image_name}:latest"
;; ;;
('beta') ('beta')
docker_version_tag="${docker_image_name}:${version}" docker_version_tag="--tag=${docker_image_name}:${version}"
docker_channel_tag="${docker_image_name}:beta" docker_channel_tag="--tag=${docker_image_name}:beta"
;; ;;
('edge') ('edge')
# Don't set the version tag when pushing to the edge channel. # Set the version tag to an empty string when pushing to the edge channel.
docker_version_tag="${docker_image_name}:edge" docker_version_tag=''
docker_channel_tag="${docker_image_name}" docker_channel_tag="--tag=${docker_image_name}:edge"
;; ;;
('development') ('development')
docker_version_tag="${docker_image_name}" # Set both tags to an empty string for development builds.
docker_channel_tag="${docker_image_name}" docker_version_tag=''
docker_channel_tag=''
;; ;;
(*) (*)
echo "invalid channel '$channel', supported values are\ echo "invalid channel '$channel', supported values are\
@ -118,6 +119,11 @@ cp "./docker/web-bind.awk"\
cp "./docker/healthcheck.sh"\ cp "./docker/healthcheck.sh"\
"${dist_docker_scripts}/healthcheck.sh" "${dist_docker_scripts}/healthcheck.sh"
# Don't use quotes with $docker_version_tag and $docker_channel_tag, because we
# want word splitting and or an empty space if tags are empty.
#
# TODO(a.garipov): Once flag --tag of docker buildx build supports commas, use
# them instead.
$sudo_cmd docker\ $sudo_cmd docker\
"$debug_flags"\ "$debug_flags"\
buildx build\ buildx build\
@ -127,7 +133,7 @@ $sudo_cmd docker\
--build-arg VERSION="$version"\ --build-arg VERSION="$version"\
--output "$docker_output"\ --output "$docker_output"\
--platform "$docker_platforms"\ --platform "$docker_platforms"\
--tag="$docker_version_tag"\ $docker_version_tag\
--tag="$docker_channel_tag"\ $docker_channel_tag\
-f ./docker/Dockerfile\ -f ./docker/Dockerfile\
. .