Merge pull request #24 from itsdalmo/revert-23-fix-version-in-docker

Revert "Fix version in docker"
itsdalmo · Aug 23, 2018 · 0be4a16 · 0be4a16
2 parents 4a354d7 + 0002fc4
commit 0be4a16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,6 @@ ADD . /go/src/github.com/itsdalmo/ssm-sh
 WORKDIR /go/src/github.com/itsdalmo/ssm-sh
 ARG TARGET=linux
 ARG ARCH=amd64
-ARG CACHE_TAG
 RUN make build-release
 
 FROM alpine:latest as resource

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ ARCH       ?= amd64
 EXT        ?= ""
 
 GIT_REF = $(shell git rev-parse --short HEAD)
-GIT_TAG = $(if $(TRAVIS_TAG),$(TRAVIS_TAG),$(if $(CACHE_TAG),$(CACHE_TAG),ref-$(GIT_REF)))
+GIT_TAG = $(if $(TRAVIS_TAG),$(TRAVIS_TAG),ref-$(GIT_REF))
 
 LDFLAGS = -ldflags "-X=main.version=$(GIT_TAG)"
 SRC     = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
@@ -41,7 +41,7 @@ run-docker:
 
 build-docker:
 	@echo "== Docker build =="
-	docker build --build-arg CACHE_TAG=$(GIT_TAG) -t $(DOCKER_REPO):latest .
+	docker build -t $(DOCKER_REPO):latest .
 
 build-release: test
 	@echo "== Release build =="