From cf1bd3ea6badfbe490f0859b5761399bfc5f4b9b Mon Sep 17 00:00:00 2001
From: Jason Kulatunga <jason@thesparktree.com>
Date: Fri, 27 May 2022 00:13:34 -0700
Subject: [PATCH] trying to fix docker build, so it includes git sha info.

---
 .github/workflows/docker-build.yaml | 8 ++++++--
 docker/Dockerfile                   | 4 +++-
 docker/Dockerfile.web               | 5 +++--
 webapp/frontend/git.version.ts      | 9 +++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index d1defe4..cb6d73c 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -106,7 +106,9 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            GIT_VERSION=${{ github.ref_type == 'tag' && github.ref_name || join([github.ref_name, '#', github.sha], '') }}
+            GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+            GITHUB_SHA=${{ env.GITHUB_SHA }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
   omnibus:
@@ -154,6 +156,8 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            GIT_VERSION=${{ github.ref_type == 'tag' && github.ref_name || join([github.ref_name, '#', github.sha], '') }}
+            GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+            GITHUB_SHA=${{ env.GITHUB_SHA }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4374b09..4cf3fd5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,9 @@ RUN go mod vendor && \
 
 ########
 FROM node:lts-slim as frontendbuild
-ARG GIT_VERSION=""
+ARG GITHUB_REF_NAME=""
+ARG GITHUB_REF_TYPE=""
+ARG GITHUB_SHA=""
 #reduce logging, disable angular-cli analytics for ci environment
 ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
 
diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web
index 91b246a..8318b53 100644
--- a/docker/Dockerfile.web
+++ b/docker/Dockerfile.web
@@ -10,8 +10,9 @@ RUN go mod vendor && \
 
 ########
 FROM node:lts-slim as frontendbuild
-ARG GIT_VERSION=""
-ENV
+ARG GITHUB_REF_NAME=""
+ARG GITHUB_REF_TYPE=""
+ARG GITHUB_SHA=""
 #reduce logging, disable angular-cli analytics for ci environment
 ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
 
diff --git a/webapp/frontend/git.version.ts b/webapp/frontend/git.version.ts
index 54b4dc2..37327c7 100644
--- a/webapp/frontend/git.version.ts
+++ b/webapp/frontend/git.version.ts
@@ -6,8 +6,13 @@ const exec = promisify(child.exec);
 
 async function createVersionsFile(filename: string) {
     let versionInfo = ''
-    if(process.env.GIT_VERSION){
-        versionInfo = process.env.GIT_VERSION
+    if(process.env.GITHUB_SHA){
+        // we're in a github action
+
+        versionInfo = process.env.GITHUB_REF_NAME
+        if(process.env.GITHUB_REF_TYPE === 'branch'){
+            versionInfo += `#${process.env.GITHUB_SHA}`
+        }
     } else {
         const tag = (await exec('git describe --tags')).stdout.toString().trim();
         const branch = (await exec('git rev-parse --abbrev-ref HEAD')).stdout.toString().trim();