Pass build args to dockerfiles (#2302)

.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 }}/*
 

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 . .

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 . .

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 . .

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 . .

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 . .

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 . .