mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-16 20:24:15 +03:00
0e84962fde
Merge in DNS/adguard-home from 2276-releases to master Updates #2276. Squashed commit of the following: commit 84961947c51477aae53606ec6e2e0cce0bdfc139 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:36:13 2020 +0300 all: fix github build commit 54af2adbf2f433e80393fb142e66ba6b3a78b13e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:34:02 2020 +0300 all: remove old Dockerfile, improve build scripts commit 99bb2f2ba1458d32074ac0911b5c02ce6669e43e Merge: 2292b677a5e20ac7edAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:47:19 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 2292b677a20ce8e93d9e6e2bb042cd468606fec3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:30:10 2020 +0300 all: improve docker build commit 0bcc97c41f105ee4a4363f20fa4775c7643bf0cc Merge: c7d3f12efaef4659e9Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 17:47:45 2020 +0300 Merge branch 'master' into WIP-2276-releases commit c7d3f12ef2b63ddfa2acf46e3129fcbc56fb0a90 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 16:28:25 2020 +0300 all: improve build scripts commit 55de1e5d7ef0fbdbd1a76cfb71362d16ca0a1966 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 15:36:47 2020 +0300 all: fix Makefile commit d11b1fe28d0fde1efeaf6160a614951b19d0ef94 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 14:16:19 2020 +0300 scripts: fix build-release commit ecc0577e2451afa86c37da7283a63a9d26fb37ba Merge: dde64ed8e483f02c92Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 13:59:32 2020 +0300 Merge branch 'master' into WIP-2276-releases commit dde64ed8e456f73559f21c2ca549dc3b46724add Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 18:04:46 2020 +0300 all: imp docs, other improvements commit be8574408db79901bb15c1d31916db3ca352a35f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 14:48:30 2020 +0300 all: imp docker build commit fc1876f34b93d667bf166226f4bc666d394f10c7 Merge: fa5a304c8955b735c8Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 13:54:29 2020 +0300 Merge branch 'master' into WIP-2276-releases commit fa5a304c83d86145796a2de4141de6d18f7c56bf Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 19:10:51 2020 +0300 all: improve scripts commit 3f32e3fd5e658d058d5c5172519384efc6cfef83 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:50:01 2020 +0300 all: improve scripts commit 2d38b81421acab4b90a7a19da7598c75063e8e93 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:25:21 2020 +0300 all: fix shell for windows, improve go-lint.sh commit d695285cd6dc476c0d972cfe0c49bbeea5f5a049 Merge: 313b020e99fb6bf82cAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:14:38 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 313b020e9dfcdab736670cee72b2171eac8c32b7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:13:31 2020 +0300 Makefile: use npm ci again commit 5acee9d6a6c8cd2a7dd04b173a73929650882bad Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:57:54 2020 +0300 all: try fixing windows build commit c63a2a54641ac8cd032a3306bb35e49b9ae74728 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:39:30 2020 +0300 all: imp scripts, try another goproxy and direct commit 423229e8b63ee73caeee8e84c23f67d145aff9df Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:25:29 2020 +0300 all: imp HACKING.md, try a new proxy ... and 1 more commit
102 lines
2.9 KiB
Bash
102 lines
2.9 KiB
Bash
#!/bin/sh
|
|
|
|
verbose="${VERBOSE:-0}"
|
|
|
|
if [ "$verbose" -gt '0' ]
|
|
then
|
|
set -x
|
|
debug_flags='-D'
|
|
else
|
|
set +x
|
|
debug_flags=''
|
|
fi
|
|
|
|
set -e -f -u
|
|
|
|
# Require these to be set. The channel value is validated later.
|
|
readonly channel="$CHANNEL"
|
|
readonly commit="$COMMIT"
|
|
readonly dist_dir="$DIST_DIR"
|
|
readonly version="$VERSION"
|
|
|
|
# Allow users to use sudo.
|
|
readonly sudo_cmd="${SUDO:-}"
|
|
|
|
readonly docker_platforms="\
|
|
linux/386,\
|
|
linux/amd64,\
|
|
linux/arm/v6,\
|
|
linux/arm/v7,\
|
|
linux/arm64,\
|
|
linux/ppc64le"
|
|
|
|
readonly build_date="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
|
|
|
|
# Set DOCKER_IMAGE_NAME to 'adguard/adguard-home' if you want (and are
|
|
# allowed) to push to DockerHub.
|
|
readonly docker_image_name="${DOCKER_IMAGE_NAME:-adguardhome-dev}"
|
|
|
|
# Set DOCKER_OUTPUT to 'type=image,name=adguard/adguard-home,push=true'
|
|
# if you want (and are allowed) to push to DockerHub.
|
|
readonly docker_output="${DOCKER_OUTPUT:-type=image,name=${docker_image_name},push=false}"
|
|
|
|
case "$channel"
|
|
in
|
|
('release')
|
|
readonly docker_image_full_name="${docker_image_name}:${version}"
|
|
readonly docker_tags="--tag ${docker_image_name}:latest"
|
|
;;
|
|
('beta')
|
|
readonly docker_image_full_name="${docker_image_name}:${version}"
|
|
readonly docker_tags="--tag ${docker_image_name}:beta"
|
|
;;
|
|
('edge')
|
|
# Don't set the version tag when pushing to the edge channel.
|
|
readonly docker_image_full_name="${docker_image_name}:edge"
|
|
readonly docker_tags=''
|
|
;;
|
|
('development')
|
|
readonly docker_image_full_name="${docker_image_name}"
|
|
readonly docker_tags=''
|
|
;;
|
|
(*)
|
|
echo "invalid channel '$channel', supported values are\
|
|
'development', 'edge', 'beta', and 'release'" 1>&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
# Copy the binaries into a new directory under new names, so that it's
|
|
# eaiser to COPY them later. DO NOT remove the trailing underscores.
|
|
# See scripts/make/Dockerfile.
|
|
readonly dist_docker="${dist_dir}/docker"
|
|
mkdir -p "$dist_docker"
|
|
cp "${dist_dir}/AdGuardHome_linux_386/AdGuardHome/AdGuardHome"\
|
|
"${dist_docker}/AdGuardHome_linux_386_"
|
|
cp "${dist_dir}/AdGuardHome_linux_amd64/AdGuardHome/AdGuardHome"\
|
|
"${dist_docker}/AdGuardHome_linux_amd64_"
|
|
cp "${dist_dir}/AdGuardHome_linux_arm64/AdGuardHome/AdGuardHome"\
|
|
"${dist_docker}/AdGuardHome_linux_arm64_"
|
|
cp "${dist_dir}/AdGuardHome_linux_arm_6/AdGuardHome/AdGuardHome"\
|
|
"${dist_docker}/AdGuardHome_linux_arm_v6"
|
|
cp "${dist_dir}/AdGuardHome_linux_arm_7/AdGuardHome/AdGuardHome"\
|
|
"${dist_docker}/AdGuardHome_linux_arm_v7"
|
|
cp "${dist_dir}/AdGuardHome_linux_ppc64le/AdGuardHome/AdGuardHome"\
|
|
"${dist_docker}/AdGuardHome_linux_ppc64le_"
|
|
|
|
# Don't use quotes with $docker_tags and $debug_flags because we want
|
|
# word splitting and or an empty space if tags are empty.
|
|
$sudo_cmd docker\
|
|
$debug_flags\
|
|
buildx build\
|
|
--build-arg BUILD_DATE="$build_date"\
|
|
--build-arg DIST_DIR="$dist_dir"\
|
|
--build-arg VCS_REF="$commit"\
|
|
--build-arg VERSION="$version"\
|
|
--output "$docker_output"\
|
|
--platform "$docker_platforms"\
|
|
$docker_tags\
|
|
-t "$docker_image_full_name"\
|
|
-f ./scripts/make/Dockerfile\
|
|
.
|