From 7e648a498f4113d10e091a24b05d497a496aed6b Mon Sep 17 00:00:00 2001 From: Tobias Lindberg Date: Thu, 23 Dec 2021 11:27:21 +0100 Subject: [PATCH] adding arg for apiVersion based on git release --- .github/workflows/build.yml | 2 ++ Dockerfile | 5 ++++- src/webserver.go | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4409a59..6698596 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,3 +54,5 @@ jobs: labels: ${{ steps.docker_meta.outputs.labels }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache + build-args: | + apiVersion=${{ github.event.release.tag_name }} diff --git a/Dockerfile b/Dockerfile index f8207bf..e9b5afe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ # get latest golang container FROM golang:1.17.5 +# get args +ARG apiVersion=unknown + # create and set workingfolder WORKDIR /go/src/ @@ -14,7 +17,7 @@ RUN go mod download COPY src/ . # compile the program -RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app . +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags="-w -s -X 'main.apiVersion=${apiVersion}'" -o app . # get latest alpine container diff --git a/src/webserver.go b/src/webserver.go index d73f1b6..9686919 100644 --- a/src/webserver.go +++ b/src/webserver.go @@ -14,8 +14,7 @@ import ( ) // setting TeslaMateApi version number -// TODO: get the value from git-tag later.. -var apiVersion = "1.11.0" +var apiVersion = "unspecified" // defining db var var db *sql.DB