diff --git a/Makefile b/Makefile index dbd776b0..2efe1809 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,10 @@ build: dependencies docker: dependencies make -f docker.mk build-base-image docker +# Generates the docker container with no cache (but does not push) +docker-no-cache: dependencies + make -f docker.mk build-base-image docker-no-cache + # Pushes container to the repository push: docker make -f docker.mk push diff --git a/docker.mk b/docker.mk index f95a3180..d32d9c8f 100644 --- a/docker.mk +++ b/docker.mk @@ -18,9 +18,13 @@ endif docker: @echo "Base Images is set to: $(BASEIMAGE)" @echo "Building: $(REGISTRY)/$(IMAGENAME):$(IMAGETAG)" - $(BUILDER) build -t "$(REGISTRY)/$(IMAGENAME):$(IMAGETAG)" --target $(BUILDSTAGE) --build-arg GOPROXY --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) . + $(BUILDER) build $(NOCACHE) -t "$(REGISTRY)/$(IMAGENAME):$(IMAGETAG)" --target $(BUILDSTAGE) --build-arg GOPROXY --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) . -push: +docker-no-cache: + @echo "Building with --no-cache ..." + @make docker NOCACHE=--no-cache + +push: @echo "Pushing: $(REGISTRY)/$(IMAGENAME):$(IMAGETAG)" $(BUILDER) push "$(REGISTRY)/$(IMAGENAME):$(IMAGETAG)"