Merge pull request #306 from gocardless/rnaveiras-fix-ldflags

Update Theatre go ldflags
gocardless · Jun 20, 2023 · d35bd70 · d35bd70
2 parents 2589933 + 94cb6db
commit d35bd70
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -19,9 +19,9 @@ builds:
       - goos: linux
         goarch: arm64
     ldflags: >
-      -X github.com/gocardless/theatre/cmd.Version={{.Version}}
-      -X github.com/gocardless/theatre/cmd.Commit={{.Commit}}
-      -X github.com/gocardless/theatre/cmd.Date={{.Date}}
+      -X github.com/gocardless/theatre/v3/cmd.Version={{.Version}}
+      -X github.com/gocardless/theatre/v3/cmd.Commit={{.Commit}}
+      -X github.com/gocardless/theatre/v3/cmd.Date={{.Date}}
       -a
       -installsuffix cgo
     env:

diff --git a/Dockerfile b/Dockerfile
@@ -3,8 +3,10 @@ FROM golang:1.20.5 as builder
 WORKDIR /go/src/github.com/gocardless/theatre
 
 COPY . /go/src/github.com/gocardless/theatre
+ARG git_revision=unset
+RUN echo $git_revision > REVISION
 RUN set -x \
-  && make VERSION="$(cat VERSION)" build
+  && make VERSION="$(cat VERSION)" GIT_REVISION="$(cat REVISION)" build
 
 # Use ubuntu as our base package to enable generic system tools
 FROM ubuntu:jammy-20230522
@@ -20,4 +22,6 @@ RUN set -x \
 
 WORKDIR /
 COPY --from=builder /go/src/github.com/gocardless/theatre/bin/* /usr/local/bin/
+ARG git_revision=unset
+RUN echo $git_revision > REVISION
 ENTRYPOINT ["/bin/bash"]
diff --git a/Makefile b/Makefile
@@ -1,8 +1,11 @@
 PROG=bin/rbac-manager bin/vault-manager bin/theatre-secrets bin/workloads-manager bin/theatre-consoles
 PROJECT=github.com/gocardless/theatre
 IMAGE=eu.gcr.io/gc-containers/gocardless/theatre
-VERSION=$(shell git rev-parse --short HEAD)-dev
-BUILD_COMMAND=go build -ldflags "-s -w -X main.Version=$(VERSION)"
+VERSION=$(shell git describe --tags  --dirty --long)
+GIT_REVISION=$(shell git rev-parse HEAD)
+DATE=$(shell date +"%Y%m%d.%H%M%S")
+LDFLAGS=-ldflags "-s -X github.com/gocardless/theatre/v3/cmd.Version=$(VERSION) -X github.com/gocardless/theatre/v3/cmd.Commit=$(GIT_REVISION) -X github.com/gocardless/theatre/v3/cmd.Date=$(DATE)"
+BUILD_COMMAND=go build $(LDFLAGS)
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.2.0
+4.2.1