Skip to content

Commit

Permalink
Merge pull request #85 from kjsanger/bugfix/only-pull-base-images
Browse files Browse the repository at this point in the history
Fix local builds broken by adding --pull globally
  • Loading branch information
kjsanger authored Oct 27, 2023
2 parents f73738a + b9d0f0f commit b3c08c0
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif
NOW=$(shell date --utc --iso-8601=seconds)

DOCKER_PREFIX?=$(DOCKER_REGISTRY)/$(DOCKER_USER)
DOCKER_ARGS ?= --platform linux/amd64 --progress=plain --pull --rm
DOCKER_ARGS ?= --platform linux/amd64 --progress=plain --rm

.PHONY: clean push

Expand Down Expand Up @@ -46,6 +46,7 @@ push: $(remote)

ub-16.04-base.$(TAG): base/ubuntu/16.04/Dockerfile
docker buildx build $(DOCKER_ARGS) \
--pull \
--load \
--label org.opencontainers.image.title="Base image, Ubuntu 16.04" \
--label org.opencontainers.image.source=$(git_url) \
Expand All @@ -58,6 +59,7 @@ ub-16.04-base.$(TAG): base/ubuntu/16.04/Dockerfile

ub-18.04-base.$(TAG): base/ubuntu/18.04/Dockerfile
docker buildx build $(DOCKER_ARGS) \
--pull \
--load \
--label org.opencontainers.image.title="Base image, Ubuntu 18.04" \
--label org.opencontainers.image.source=$(git_url) \
Expand All @@ -70,6 +72,7 @@ ub-18.04-base.$(TAG): base/ubuntu/18.04/Dockerfile

ub-22.04-base.$(TAG): base/ubuntu/22.04/Dockerfile
docker buildx build $(DOCKER_ARGS) \
--pull \
--load \
--label org.opencontainers.image.title="Base image, Ubuntu 22.04" \
--label org.opencontainers.image.source=$(git_url) \
Expand Down

0 comments on commit b3c08c0

Please sign in to comment.