From be43ce1760a10360d0a1379234b33ced3c647251 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Thu, 16 Feb 2023 17:04:35 +0300
Subject: [PATCH] Pull request 1741: docker-spec-no-make

Merge in DNS/adguard-home from docker-spec-no-make to master

Squashed commit of the following:

commit 897edba3bc23cdc105bc0f4017c862d84128fd71
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 16 16:57:31 2023 +0300

    bamboo-specs: do not require make where not needed
---
 bamboo-specs/release.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index a6807e85..f02431e0 100644
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -136,8 +136,12 @@
 
         set -e -f -u -x
 
+        COMMIT="${bamboo.repository.revision.number}"
+        export COMMIT
+        readonly COMMIT
+
         # Explicitly checkout the revision that we need.
-        git checkout "${bamboo.repository.revision.number}"
+        git checkout "$COMMIT"
 
         # Install Qemu, create builder.
         docker version -f '{{ .Server.Experimental }}'
@@ -157,12 +161,13 @@
         docker info
 
         # Prepare and push the build.
-        make\
+        env\
                 CHANNEL="${bamboo.channel}"\
+                DIST_DIR='dist'\
                 DOCKER_IMAGE_NAME='adguard/adguardhome'\
                 DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
                 VERBOSE='1'\
-                build-docker
+                sh ./scripts/make/build-docker.sh
       'environment':
         DOCKER_CLI_EXPERIMENTAL=enabled
   'final-tasks':