docker: imp

Author: Mizzick

bamboo-specs/snapcraft.yaml

@@ -67,6 +67,7 @@
                   --build-arg "BASE_IMAGE=${bamboo_dockerSnap}"
                   --build-arg "CACHE_BUSTER=${bamboo_cacheBuster}" \
                   --build-arg "CHANNEL=${bamboo_channel}" \
+                  --build-arg "VERSION=${bamboo_buildNumber}" \
                   --output '.' \
                   --progress 'plain' \
                   --target 'builder-exporter' \
@@ -102,6 +103,7 @@
                     --build-arg "CACHE_BUSTER=${bamboo_cacheBuster}" \
                     --build-arg "SNAPCRAFT_CHANNEL=${bamboo_snapcraftChannel}" \
                     --build-arg "SNAPCRAFT_STORE_CREDENTIALS=${bamboo_snapcraftMacaroonPassword}" \
+                    --build-arg "VERSION=${bamboo_buildNumber}" \
                     --output '.' \
                     --progress 'plain' \
                     --target 'publisher' \

docker/ci.Dockerfile

@@ -169,7 +169,7 @@ RUN \
 <<-'EOF'
 set -e -f -u -x
 
-# Import GPG key if provided
+# Import GPG key if provided.
 if [ "${GPG_SECRET_KEY:-}" != '' ]; then
     echo "$GPG_SECRET_KEY" | awk '{ gsub(/\\n/, "\n"); print; }' | gpg --import --batch --yes
 fi

docker/snapcraft.Dockerfile

@@ -34,27 +34,29 @@ ARG BASE_IMAGE=adguard/snap-builder:2.1
 FROM "$BASE_IMAGE" AS builder
 ARG CACHE_BUSTER=0
 ARG CHANNEL=development
+ARG VERSION=""
 ADD snap /app/snap
 ADD scripts /app/scripts
 WORKDIR /app
 RUN \
 <<-'EOF'
 set -e -f -u -x
 
+export VERBOSE='1'
+
 env \
 	CHANNEL="${CHANNEL}" \
-	VERBOSE='1' \
-	sh ./scripts/snap/download.sh
+	sh ./scripts/snap/download.sh \
+	;
 
-env \
-	VERBOSE='1' \
-	sh ./scripts/snap/build.sh
+sh ./scripts/snap/build.sh
 EOF
 
 # builder-exporter exports the build artifacts to the host machine so that they
 # could be published.  This stage should only be used in a CI.
 FROM scratch AS builder-exporter
 ARG CACHE_BUSTER=0
+ARG VERSION=""
 COPY --from=builder /app/AdGuardHome_amd64.snap /AdGuardHome_amd64.snap
 COPY --from=builder /app/AdGuardHome_arm64.snap /AdGuardHome_arm64.snap
 COPY --from=builder /app/AdGuardHome_armhf.snap /AdGuardHome_armhf.snap
@@ -65,6 +67,7 @@ FROM "$BASE_IMAGE" AS publisher
 ARG CACHE_BUSTER=0
 ARG SNAPCRAFT_CHANNEL=0
 ARG SNAPCRAFT_STORE_CREDENTIALS=0
+ARG VERSION=""
 ADD snap /app/snap
 ADD scripts /app/scripts
 ADD AdGuardHome_amd64.snap /app/AdGuardHome_amd64.snap