Skip to content

Commit f59dff0

Browse files
ekoopsleogr
authored andcommitted
fix(Makefile): pass build args to push/{builder,latest}
Signed-off-by: Leonardo Di Giovanna <[email protected]>
1 parent d059891 commit f59dff0

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

Makefile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,26 @@ push/all: push/builder push/driverkit
7474

7575
.PHONY: push/builder
7676
push/builder:
77-
$(foreach b,$(BUILDERS),\
78-
$(DOCKER) buildx build --push -t "$(IMAGE_NAME_BUILDER_BASE):$b-$(GIT_REF)" -t "$(IMAGE_NAME_BUILDER_BASE):$b-$(GIT_COMMIT)" -f docker/builders/builder-$b.Dockerfile . ; \
79-
)
77+
@ for b in $(BUILDERS); do \
78+
$(DOCKER) buildx build --push \
79+
-t "$(IMAGE_NAME_BUILDER_BASE):$$b-$(GIT_REF)" \
80+
-t "$(IMAGE_NAME_BUILDER_BASE):$$b-$(GIT_COMMIT)" \
81+
-f docker/builders/builder-$$b.Dockerfile \
82+
--build-arg CMAKE_VERSION=$(BUILDERS_CMAKE_VERSION) . ; \
83+
done
8084

8185
.PHONY: push/driverkit
8286
push/driverkit:
8387
$(DOCKER) buildx build --push -t "$(IMAGE_NAME_DRIVERKIT_REF)" -t "$(IMAGE_NAME_DRIVERKIT_COMMIT)" -f docker/driverkit.Dockerfile .
8488

8589
.PHONY: push/latest
8690
push/latest:
87-
$(foreach b,$(BUILDERS),\
88-
$(DOCKER) buildx build --push -t "$(IMAGE_NAME_BUILDER_BASE):$b-latest" -f docker/builders/builder-$b.Dockerfile . ; \
89-
)
91+
@ for b in $(BUILDERS); do \
92+
$(DOCKER) buildx build --push \
93+
-t "$(IMAGE_NAME_BUILDER_BASE):$$b-latest" \
94+
-f docker/builders/builder-$$b.Dockerfile \
95+
--build-arg CMAKE_VERSION=$(BUILDERS_CMAKE_VERSION) . ; \
96+
done
9097
$(DOCKER) buildx build --push -t "$(IMAGE_NAME_DRIVERKIT_LATEST)" -f docker/driverkit.Dockerfile .
9198

9299
manifest/all: manifest/driverkit

0 commit comments

Comments
 (0)