all: imp ci scripts

Author: Mizzick

.github/workflows/docker.yml

@@ -30,9 +30,11 @@
           'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
           'restore-keys': '${{ runner.os }}-go-'
       - 'name': 'Set up QEMU'
-        'uses': 'docker/setup-qemu-action@v1'
+        'uses': 'docker/setup-qemu-action@v3'
       - 'name': 'Set up Docker Buildx'
-        'uses': 'docker/setup-buildx-action@v1'
+        'uses': 'docker/setup-buildx-action@v3'
+        'with':
+          'install': true'
       - 'name': 'Publish to Docker Hub'
         'env':
           'DOCKER_USER': ${{ secrets.DOCKER_USER }}
@@ -51,7 +53,7 @@
           make \
             VERSION="${RELEASE_VERSION}" \
             DOCKER_IMAGE_NAME="adguard/dnsproxy" \
-            DOCKER_OUTPUT="type=image,name=adguard/dnsproxy,push=true" \
+            DOCKER_PUSH="1" \
             VERBOSE="1" \
             docker
 

scripts/make/build-docker.sh

@@ -4,12 +4,9 @@ verbose="${VERBOSE:-0}"
 
 if [ "$verbose" -gt '0' ]; then
 	set -x
-	debug_flags='--debug=1'
 else
 	set +x
-	debug_flags='--debug=0'
 fi
-readonly debug_flags
 
 set -e -f -u
 
@@ -40,15 +37,9 @@ readonly build_date
 docker_image_name="${DOCKER_IMAGE_NAME:-dnsproxy-dev}"
 readonly docker_image_name
 
-# Set DOCKER_OUTPUT to 'type=image,name=adguard/dnsproxy,push=true' if you
-# want (and are allowed) to push to DockerHub.
-#
-# If you want to inspect the resulting image using commands like "docker image
-# ls", change type to docker and also set docker_platforms to a single platform.
-#
-# See https://github.com/docker/buildx/issues/166.
-docker_output="${DOCKER_OUTPUT:-type=image,name=${docker_image_name},push=false}"
-readonly docker_output
+# Set DOCKER_PUSH to '1' if you want (and are allowed) to push to DockerHub.
+docker_push="${DOCKER_PUSH:-0}"
+readonly docker_push
 
 docker_version_tag="--tag=${docker_image_name}:${version}"
 docker_channel_tag="--tag=${docker_image_name}:latest"
@@ -84,24 +75,50 @@ cp "${dist_dir}/linux-ppc64le/dnsproxy" \
 # Prepare the default configuration for the Docker image.
 cp ./config.yaml.dist "${dist_docker}/config.yaml"
 
-# 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.
-#
-# shellcheck disable=SC2086
-$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_version_tag \
-	$docker_channel_tag \
-	-f ./docker/build.Dockerfile \
-	. \
-	;
+# docker_build_opt_tag is a function that wraps the call of docker build command
+# with optionally --tag flags.
+docker_build_opt_tag() {
+	if [ "$sudo_cmd" != '' ]; then
+		set -- "$sudo_cmd"
+	fi
+
+	# Set the initial parameters.
+	set -- \
+		"$@" \
+		docker \
+		buildx \
+		build \
+		--build-arg BUILD_DATE="$build_date" \
+		--build-arg DIST_DIR="$dist_dir" \
+		--build-arg VCS_REF="$commit" \
+		--build-arg VERSION="$version" \
+		--platform "$docker_platforms" \
+		--progress 'plain' \
+		;
+
+	# Append the channel tag, if any.
+	if [ "$docker_channel_tag" != '' ]; then
+		set -- "$@" "$docker_channel_tag"
+	fi
+
+	# Append the version tag.
+	set -- "$@" "$docker_version_tag"
+
+	# Push to DockerHub, if requested.
+	if [ "$docker_push" -eq 1 ]; then
+		set -- "$@" '--push'
+	fi
+
+	# Append the rest.
+	set -- \
+		"$@" \
+		-f \
+		./docker/build.Dockerfile \
+		. \
+		;
+
+	# Call the command with the assembled parameters.
+	"$@"
+}
+
+docker_build_opt_tag