From b6078ed3426463b9e920ba461d88434203725d90 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Thu, 9 Feb 2023 19:23:00 -0800
Subject: [PATCH] build: Passthrough $VERSION explicitly to docker/build.sh

---
 ci/release/build.sh        | 5 ++++-
 ci/release/docker/build.sh | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ci/release/build.sh b/ci/release/build.sh
index 2335a513e..d1c7d8e66 100755
--- a/ci/release/build.sh
+++ b/ci/release/build.sh
@@ -257,6 +257,7 @@ ARCHIVE=$ARCHIVE \
 build_docker() {
   if [ -n "${LOCAL-}" ]; then
     sh_c ./ci/release/docker/build.sh \
+      --version="$VERSION" \
       ${PUSH_DOCKER:+--push} \
       ${LATEST_DOCKER:+--latest}
     return 0
@@ -264,8 +265,10 @@ build_docker() {
 
   sh_c lockfile_ssh "$CI_D2_LINUX_AMD64" .d2-build-lock
   sh_c gitsync "$CI_D2_LINUX_AMD64" src/d2
-  sh_c ssh "$CI_D2_LINUX_AMD64" "D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE-}" \
+  sh_c ssh "$CI_D2_LINUX_AMD64" \
+    "D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE-}" \
     ./src/d2/ci/release/docker/build.sh \
+    --version="$VERSION" \
     ${PUSH_DOCKER:+--push} \
     ${LATEST_DOCKER:+--latest}
 }
diff --git a/ci/release/docker/build.sh b/ci/release/docker/build.sh
index 0f7475d4f..849712ffe 100755
--- a/ci/release/docker/build.sh
+++ b/ci/release/docker/build.sh
@@ -6,7 +6,7 @@ cd -- "$(dirname "$0")/../../.."
 
 help() {
       cat <<EOF
-usage: $0 [-p|--push] [--latest] [
+usage: $0 [-p|--push] [--latest] [--version=str]
 EOF
 }
 
@@ -25,6 +25,10 @@ main() {
         flag_noarg && shift "$FLAGSHIFT"
         LATEST=1
         ;;
+      version)
+        flag_reqarg && shift "$FLAGSHIFT"
+        VERSION=$FLAGARG
+        ;;
       *)
         flag_errusage "unrecognized flag $FLAGRAW"
         ;;