Merge pull request #231 from triggermesh/docker-fix

dockerfile: fix path to tm binary from build stage
triggermesh · Jul 11, 2022 · 258bac4 · 258bac4
2 parents 0a156ed + 3cb0910
commit 258bac4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,4 +23,4 @@ RUN apt-get update && \
     apt-get install --no-install-recommends --no-install-suggests -y ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=build /go/bin/linux_amd64/tm /bin/tm
+COPY --from=build /go/bin/tm /bin/tm
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ TARGETS      ?= darwin/amd64 linux/amd64 windows/amd64
 DIST_DIR     ?=
 
 GIT_REPO      = github.com/triggermesh/tm
-GIT_TAG      ?= $(shell git describe --tags --always)
+GIT_TAG      ?= $(shell git for-each-ref refs/tags --sort=-taggerdate --format='%(refname:short)' --count=1)
 
 DOCKER        = docker
 IMAGE_REPO   ?= gcr.io/triggermesh