From 53a5f3cc7c93dbe3851314d715d69f547152cb0d Mon Sep 17 00:00:00 2001
From: Charlie <2747302+CharlieC3@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:57:20 -0500
Subject: [PATCH] Pass build args to dockerfiles (#2302)

---
 .github/workflows/stacks-blockchain.yml | 20 ++++++++++++++++----
 build-scripts/Dockerfile.linux-arm64    |  4 ++++
 build-scripts/Dockerfile.linux-armv7    |  4 ++++
 build-scripts/Dockerfile.linux-musl-x64 |  4 ++++
 build-scripts/Dockerfile.linux-x64      |  4 ++++
 build-scripts/Dockerfile.macos-x64      |  4 ++++
 build-scripts/Dockerfile.windows-x64    |  4 ++++
 7 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/stacks-blockchain.yml b/.github/workflows/stacks-blockchain.yml
index a1d26cb92..fa1cd3e4b 100644
--- a/.github/workflows/stacks-blockchain.yml
+++ b/.github/workflows/stacks-blockchain.yml
@@ -70,12 +70,24 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Set Vars
+        run: |
+          echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV
+          echo "GITHUB_REF_SHORT=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
       - name: Build distributable
-        env:
-          DIST_TARGET_FILTER: ${{ matrix.platform }}
-        run: build-scripts/build-dist.sh
-
+        uses: docker/build-push-action@v2.2.1
+        with:
+          file: build-scripts/Dockerfile.${{ matrix.platform }}
+          outputs: dist/${{ matrix.platform }}
+          build-args: |
+            STACKS_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }}
+            GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
+            GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
+          
       - name: Compress artifact
         run: zip --junk-paths ${{ matrix.platform }} ./dist/${{ matrix.platform }}/*
 
diff --git a/build-scripts/Dockerfile.linux-arm64 b/build-scripts/Dockerfile.linux-arm64
index a891a67a3..9260adfc9 100644
--- a/build-scripts/Dockerfile.linux-arm64
+++ b/build-scripts/Dockerfile.linux-arm64
@@ -1,5 +1,9 @@
 FROM rust:stretch as build
 
+ARG STACKS_NODE_VERSION="No Version Info"
+ARG GIT_BRANCH='No Branch Info'
+ARG GIT_COMMIT='No Commit Info'
+
 WORKDIR /src
 
 COPY . .
diff --git a/build-scripts/Dockerfile.linux-armv7 b/build-scripts/Dockerfile.linux-armv7
index 3367f8063..0f7d5f95a 100644
--- a/build-scripts/Dockerfile.linux-armv7
+++ b/build-scripts/Dockerfile.linux-armv7
@@ -1,5 +1,9 @@
 FROM rust:stretch as build
 
+ARG STACKS_NODE_VERSION="No Version Info"
+ARG GIT_BRANCH='No Branch Info'
+ARG GIT_COMMIT='No Commit Info'
+
 WORKDIR /src
 
 COPY . .
diff --git a/build-scripts/Dockerfile.linux-musl-x64 b/build-scripts/Dockerfile.linux-musl-x64
index 88432678f..4087d3704 100644
--- a/build-scripts/Dockerfile.linux-musl-x64
+++ b/build-scripts/Dockerfile.linux-musl-x64
@@ -1,5 +1,9 @@
 FROM rust:stretch as build
 
+ARG STACKS_NODE_VERSION="No Version Info"
+ARG GIT_BRANCH='No Branch Info'
+ARG GIT_COMMIT='No Commit Info'
+
 WORKDIR /src
 
 COPY . .
diff --git a/build-scripts/Dockerfile.linux-x64 b/build-scripts/Dockerfile.linux-x64
index 270759576..ca13a37e4 100644
--- a/build-scripts/Dockerfile.linux-x64
+++ b/build-scripts/Dockerfile.linux-x64
@@ -1,5 +1,9 @@
 FROM rust:stretch as build
 
+ARG STACKS_NODE_VERSION="No Version Info"
+ARG GIT_BRANCH='No Branch Info'
+ARG GIT_COMMIT='No Commit Info'
+
 WORKDIR /src
 
 COPY . .
diff --git a/build-scripts/Dockerfile.macos-x64 b/build-scripts/Dockerfile.macos-x64
index 103b13c1f..27f030efe 100644
--- a/build-scripts/Dockerfile.macos-x64
+++ b/build-scripts/Dockerfile.macos-x64
@@ -1,5 +1,9 @@
 FROM rust:stretch as build
 
+ARG STACKS_NODE_VERSION="No Version Info"
+ARG GIT_BRANCH='No Branch Info'
+ARG GIT_COMMIT='No Commit Info'
+
 WORKDIR /src
 
 COPY . .
diff --git a/build-scripts/Dockerfile.windows-x64 b/build-scripts/Dockerfile.windows-x64
index e711a8c1c..5af82f29d 100644
--- a/build-scripts/Dockerfile.windows-x64
+++ b/build-scripts/Dockerfile.windows-x64
@@ -1,5 +1,9 @@
 FROM rust:stretch as build
 
+ARG STACKS_NODE_VERSION="No Version Info"
+ARG GIT_BRANCH='No Branch Info'
+ARG GIT_COMMIT='No Commit Info'
+
 WORKDIR /src
 
 COPY . .