automation: use DOCKER_CMD for building containers too
authorDario Faggioli <dfaggioli@suse.com>
Tue, 18 May 2021 16:42:39 +0000 (18:42 +0200)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Wed, 19 May 2021 18:21:07 +0000 (19:21 +0100)
Use DOCKER_CMD from the environment (if defined) in the containers'
makefile too, so that, e.g., when doing `export DOCKED_CMD=podman`
podman is used for building the containers too.

Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
automation/build/Makefile

index 7c7612b1d9c921092ecd9163c03a13f6fa741cb8..a4b2b85178cf1f0b3d30e0b145c235b3b4fbe40c 100644 (file)
@@ -2,6 +2,7 @@
 # the base of where these containers will appear
 REGISTRY := registry.gitlab.com/xen-project/xen
 CONTAINERS = $(subst .dockerfile,,$(wildcard */*.dockerfile))
+DOCKER_CMD ?= docker
 
 help:
        @echo "Builds containers for building Xen based on different distros"
@@ -10,9 +11,9 @@ help:
        @echo "To push container builds, set the env var PUSH"
 
 %: %.dockerfile ## Builds containers
-       docker build -t $(REGISTRY)/$(@D):$(@F) -f $< $(<D)
+       $(DOCKER_CMD) build -t $(REGISTRY)/$(@D):$(@F) -f $< $(<D)
        @if [ ! -z $${PUSH+x} ]; then \
-               docker push $(REGISTRY)/$(@D):$(@F); \
+               $(DOCKER_CMD) push $(REGISTRY)/$(@D):$(@F); \
        fi
 
 .PHONY: all