Do get version with Makefile so we can use the buildx cache properly

primeroz · Dec 17, 2020 · 89a613d · 89a613d
1 parent 52da30b
commit 89a613d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/on-push-main.yml b/.github/workflows/on-push-main.yml
@@ -64,7 +64,6 @@ jobs:
         --cache-from "type=local,src=/tmp/.buildx-cache" \
         --cache-to "type=local,dest=/tmp/.buildx-cache" \
         --platform linux/arm64,linux/amd64,linux/arm/v7 \
-        --build-arg VERSION=$SHORTSHA \
         --tag ${{ secrets.DOCKER_USERNAME }}/$DOCKER_HUB_REPO:master-$SHORTSHA \
         --output "type=registry" .
 
@@ -74,6 +73,5 @@ jobs:
         --cache-from "type=local,src=/tmp/.buildx-cache" \
         --cache-to "type=local,dest=/tmp/.buildx-cache" \
         --platform linux/arm64,linux/amd64,linux/arm/v7 \
-        --build-arg VERSION=$SHORTSHA \
         --tag ${{ secrets.DOCKER_USERNAME }}/$DOCKER_HUB_REPO:latest \
         --output "type=registry" .
diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
@@ -54,7 +54,6 @@ jobs:
         docker buildx build \
         --cache-from "type=local,src=/tmp/.buildx-cache" \
         --cache-to "type=local,dest=/tmp/.buildx-cache" \
-        --build-arg VERSION=$TAG \
         --platform linux/amd64,linux/arm64,linux/arm/v7 \
         --tag ${{ secrets.DOCKER_USERNAME }}/$DOCKER_HUB_REPO:$TAG \
         --output "type=registry" .
@@ -64,7 +63,6 @@ jobs:
         docker buildx build \
         --cache-from "type=local,src=/tmp/.buildx-cache" \
         --cache-to "type=local,dest=/tmp/.buildx-cache" \
-        --build-arg VERSION=$TAG \
         --platform linux/amd64,linux/arm64,linux/arm/v7 \
         --tag ${{ secrets.DOCKER_USERNAME }}/$DOCKER_HUB_REPO:latest \
         --output "type=registry" .
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,5 @@
 FROM golang:1.15-buster as build
 
-ARG VERSION
-ENV VERSION $VERSION
-
 WORKDIR /workspace
 COPY . /workspace
 

diff --git a/main.go b/main.go
@@ -12,7 +12,7 @@ import (
 
 var result = orderResult{}
 var log = logrus.New()
-var version string
+var Version string
 
 func init() {
 	// Setup Logging
@@ -23,14 +23,13 @@ func init() {
 	//log.SetLevel(logrus.InfoLevel)
 	log.SetLevel(logrus.DebugLevel)
 
-	// Set Version from Env
-	version = os.Getenv("VERSION")
-	if len(version) == 0 {
+	// Set Version
+	if len(Version) == 0 {
 		out, err := exec.Command("git", "rev-parse", "--short", "HEAD").Output()
 		if err != nil {
-			version = "master"
+			Version = "master"
 		} else {
-			version = string(out)
+			Version = string(out)
 		}
 	}
 }
@@ -198,7 +197,7 @@ func main() {
 
 	app := &cli.App{
 		Name:     "sats-stacker",
-		Version:  version,
+		Version:  Version,
 		Compiled: time.Now(),
 		Authors: []*cli.Author{
 			&cli.Author{