From e52b04dfa3801da71aa1542cb44567a1ca13c7af Mon Sep 17 00:00:00 2001 From: Nolan Brubaker Date: Fri, 10 May 2019 15:08:27 -0400 Subject: [PATCH] Always pull the docker layers on image build Signed-off-by: Nolan Brubaker --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7c0917ee7..288cca4fc 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ DOTFILE_IMAGE = $(subst :,_,$(subst /,_,$(IMAGE))-$(VERSION)) build-fsfreeze: BIN = fsfreeze-pause build-fsfreeze: @cp $(DOCKERFILE) _output/.dockerfile-$(BIN).alpine - @docker build -t $(IMAGE):$(VERSION) -f _output/.dockerfile-$(BIN).alpine _output + @docker build --pull -t $(IMAGE):$(VERSION) -f _output/.dockerfile-$(BIN).alpine _output @docker images -q $(IMAGE):$(VERSION) > .container-$(DOTFILE_IMAGE) push-fsfreeze: BIN = fsfreeze-pause @@ -152,7 +152,7 @@ all-containers: container: verify test .container-$(DOTFILE_IMAGE) container-name .container-$(DOTFILE_IMAGE): _output/bin/$(GOOS)/$(GOARCH)/$(BIN) $(DOCKERFILE) @cp $(DOCKERFILE) _output/.dockerfile-$(BIN)-$(GOOS)-$(GOARCH) - @docker build -t $(IMAGE):$(VERSION) -f _output/.dockerfile-$(BIN)-$(GOOS)-$(GOARCH) _output + @docker build --pull -t $(IMAGE):$(VERSION) -f _output/.dockerfile-$(BIN)-$(GOOS)-$(GOARCH) _output @docker images -q $(IMAGE):$(VERSION) > $@ container-name: @@ -200,7 +200,7 @@ build-dirs: @mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(GOOS)/$(GOARCH) .go/go-build build-image: - cd hack/build-image && docker build -t $(BUILDER_IMAGE) . + cd hack/build-image && docker build --pull -t $(BUILDER_IMAGE) . clean: rm -rf .container-* _output/.dockerfile-* .push-*