diff --git a/Dockerfile b/Dockerfile index 0620816..bef99ec 100644 --- 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 index 7e3fc4b..9c22d4c 100644 --- 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 =="