From f839212b302f16fbc03aee675d9296a2ce495f8d Mon Sep 17 00:00:00 2001
From: Roee Gadot <roee.gadot@up9.com>
Date: Thu, 15 Jul 2021 14:09:27 +0300
Subject: [PATCH] no message

---
 .github/workflows/publish.yml |  8 +++++---
 Dockerfile                    | 13 +++++++++----
 api/main.go                   |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 805c78cf7..e9ded1a80 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -60,9 +60,11 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-        env:
-           SEM_VER: ${{ steps.versioning.outputs.version }}
-           BUILD_TIMESTAMP: ${{ steps.version_parameters.outputs.build_timestamp }}
+          build-args: |
+            SEM_VER=${{ steps.versioning.outputs.version }}
+            BUILD_TIMESTAMP=${{ steps.version_parameters.outputs.build_timestamp }}
+            GIT_BRANCH=${{ steps.version_parameters.outputs.branch }}
+            COMMIT_HASH=${{ github.sha }}
 #      - name: Build and Push CLI
 #        run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}'
 #      - name: publish
diff --git a/Dockerfile b/Dockerfile
index dad77821e..fb93556af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,15 +23,20 @@ RUN go mod download
 # cheap trick to make the build faster (As long as go.mod wasn't changes)
 RUN go list -f '{{.Path}}@{{.Version}}' -m all | sed 1d | grep -e 'go-cache' -e 'sqlite' | xargs go get
 
+ARG COMMIT_HASH
+ARG GIT_BRANCH
+ARG BUILD_TIMESTAMP
+ARG SEM_VER
+
 # Copy and build api code
 COPY shared ../shared
 COPY tap ../tap
 COPY api .
 RUN go build -ldflags="-s -w \
-     -X 'mizuserver/version.GitCommitHash=$(COMMIT_HASH)' \
-     -X 'mizuserver/version.Branch=$(GIT_BRANCH)' \
-     -X 'mizuserver/version.BuildTimestamp=$(BUILD_TIMESTAMP)' \
-     -X 'mizuserver/version.SemVer=$(SEM_VER)'" -o mizuagent .
+     -X 'mizuserver/version.GitCommitHash=${COMMIT_HASH}' \
+     -X 'mizuserver/version.Branch=${GIT_BRANCH}' \
+     -X 'mizuserver/version.BuildTimestamp=${BUILD_TIMESTAMP}' \
+     -X 'mizuserver/version.SemVer=${SEM_VER}'" -o mizuagent .
 
 
 FROM alpine:3.13.5
diff --git a/api/main.go b/api/main.go
index ef9daa6d4..f93c5a9ba 100644
--- a/api/main.go
+++ b/api/main.go
@@ -28,7 +28,7 @@ var standalone = flag.Bool("standalone", false, "Run in standalone tapper and AP
 var aggregatorAddress = flag.String("aggregator-address", "", "Address of mizu collector for tapping")
 
 func main() {
-	rlog.Infof("Version parameters are: %s %s %s %s",  version.Branch, version.SemVer, version.BuildTimestamp, version.BuildTimestamp)
+	rlog.Infof("Version parameters are: %s %s %s %s",  version.Branch, version.SemVer, version.GitCommitHash, version.BuildTimestamp)
 
 	flag.Parse()
 	hostMode := os.Getenv(shared.HostModeEnvVar) == "1"