Skip to content

Commit 7c5f8fb

Browse files
committed
Rename ARGS to DOCKER_BUILD_ARGS
Better naming of this, as it's arguments of the docker build phase.
1 parent e25f68d commit 7c5f8fb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ help:
4848

4949

5050

51-
build/%: ARGS?=
51+
build/%: DOCKER_BUILD_ARGS?=
5252
build/%: ## build the latest image for a stack using the system's architecture
5353
@echo "::group::Build $(OWNER)/$(notdir $@) (system's architecture)"
54-
docker build $(ARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER)
54+
docker build $(DOCKER_BUILD_ARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER)
5555
@echo -n "Built image size: "
5656
@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
5757
@echo "::endgroup::"
@@ -97,16 +97,16 @@ build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks
9797
# without needing to update this Makefile, and if all tests succeeds we can
9898
# do a publish job that creates a multi-platform image for us.
9999
#
100-
build/%: ARGS?=
100+
build/%: DOCKER_BUILD_ARGS?=
101101
build-multi/%: ## build the latest image for a stack on both amd64 and arm64
102102
@echo "::group::Build $(OWNER)/$(notdir $@) (system's architecture)"
103-
docker buildx build $(ARGS) -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --load
103+
docker buildx build $(DOCKER_BUILD_ARGS) -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --load
104104
@echo -n "Built image size: "
105105
@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
106106
@echo "::endgroup::"
107107

108108
@echo "::group::Build $(OWNER)/$(notdir $@) (amd64,arm64)"
109-
docker buildx build $(ARGS) -t build-multi-tmp-cache/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --platform "linux/amd64,linux/arm64"
109+
docker buildx build $(DOCKER_BUILD_ARGS) -t build-multi-tmp-cache/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --platform "linux/amd64,linux/arm64"
110110
@echo "::endgroup::"
111111
build-all-multi: $(foreach I, $(MULTI_IMAGES), build-multi/$(I)) $(foreach I, $(AMD64_ONLY_IMAGES), build/$(I)) ## build all stacks
112112

@@ -183,10 +183,10 @@ push/%: ## push all tags for a jupyter image
183183
@echo "::endgroup::"
184184
push-all: $(foreach I, $(ALL_IMAGES), push/$(I)) ## push all tagged images
185185

186-
push-multi/%: ARGS?=
186+
push-multi/%: DOCKER_BUILD_ARGS?=
187187
push-multi/%: ## push all tags for a jupyter image that support multiple architectures
188188
@echo "::group::Push $(OWNER)/$(notdir $@) (amd64,arm64)"
189-
docker buildx build $(ARGS) $($(subst -,_,$(notdir $@))_EXTRA_TAG_ARGS) -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --platform "linux/amd64,linux/arm64" --push
189+
docker buildx build $(DOCKER_BUILD_ARGS) $($(subst -,_,$(notdir $@))_EXTRA_TAG_ARGS) -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --platform "linux/amd64,linux/arm64" --push
190190
@echo "::endgroup::"
191191
push-all-multi: $(foreach I, $(MULTI_IMAGES), push-multi/$(I)) $(foreach I, $(AMD64_ONLY_IMAGES), push/$(I)) ## push all tagged images
192192

0 commit comments

Comments
 (0)