From: Dario Faggioli <dfaggioli@suse.com>
To: xen-devel@lists.xenproject.org
Cc: Doug Goldstein <cardoe@cardoe.com>,
Roger Pau Monne <roger.pau@citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 1/2] automation: use DOCKER_CMD for building containers too
Date: Tue, 18 May 2021 14:04:07 +0200 [thread overview]
Message-ID: <162133944760.25010.12549941575201320853.stgit@Wayrath> (raw)
In-Reply-To: <162133919718.25010.4197057069904956422.stgit@Wayrath>
From: Dario Faggioli <dario@Solace.fritz.box>
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>
---
Cc: Doug Goldstein <cardoe@cardoe.com>
Cc: Roger Pau Monne <roger.pau@citrix.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
automation/build/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/automation/build/Makefile b/automation/build/Makefile
index 7c7612b1d9..a4b2b85178 100644
--- a/automation/build/Makefile
+++ b/automation/build/Makefile
@@ -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
next prev parent reply other threads:[~2021-05-18 12:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 12:04 [PATCH 0/2] automation: fix building in the openSUSE Tumbleweed Dario Faggioli
2021-05-18 12:04 ` Dario Faggioli [this message]
2021-05-18 14:26 ` [PATCH 1/2] automation: use DOCKER_CMD for building containers too Roger Pau Monné
2021-05-18 14:35 ` Dario Faggioli
2021-05-18 12:04 ` [PATCH 2/2] automation: fix dependencies on openSUSE Tumbleweed containers Dario Faggioli
2021-05-18 13:20 ` Roger Pau Monné
2021-05-18 14:33 ` Dario Faggioli
2021-05-18 15:09 ` Roger Pau Monné
2021-05-18 15:30 ` Dario Faggioli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162133944760.25010.12549941575201320853.stgit@Wayrath \
--to=dfaggioli@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=cardoe@cardoe.com \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).