From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>
Subject: [PULL v2 20/24] tests/docker: use direct RUNC call to build containers
Date: Wed, 1 Mar 2023 15:16:00 +0000 [thread overview]
Message-ID: <20230301151604.1948813-21-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org>
We don't really need stuff from docker.py to do the build as we have
everything we need with a direct call. We do rely on the dockerfiles
being able to tweak the UID/name mapping as the last step.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230228190653.1602033-21-alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index bfb0dcac21..680afff952 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -7,6 +7,8 @@ SPACE := $(NULL) #
COMMA := ,
HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
+USER = $(if $(NOUSER),,$(shell id -un))
+UID = $(if $(NOUSER),,$(shell id -u))
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
ifeq ($(HOST_ARCH),x86_64)
@@ -14,6 +16,7 @@ DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu
endif
DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY))
+RUNC ?= docker
ENGINE ?= auto
DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE)
@@ -35,15 +38,17 @@ docker-qemu-src: $(DOCKER_SRC_COPY)
# General rule for building docker images.
docker-image-%: $(DOCKER_FILES_DIR)/%.docker
- $(call quiet-command,\
- $(DOCKER_SCRIPT) build -t qemu/$* -f $< \
- $(if $V,,--quiet) \
- $(if $(NOCACHE),--no-cache, \
- $(if $(DOCKER_REGISTRY),--registry $(DOCKER_REGISTRY))) \
- $(if $(NOUSER),,--add-current-user) \
- $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\
- $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
- "BUILD","$*")
+ $(call quiet-command, \
+ $(RUNC) build \
+ $(if $V,,--quiet) \
+ $(if $(NOCACHE),--no-cache, \
+ $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \
+ --build-arg BUILDKIT_INLINE_CACHE=1 \
+ $(if $(NOUSER),, \
+ --build-arg USER=$(USER) \
+ --build-arg UID=$(UID)) \
+ -t qemu/$* - < $<, \
+ "BUILD", $1)
# Special rule for debootstraped binfmt linux-user images
docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
--
2.39.2
next prev parent reply other threads:[~2023-03-01 15:18 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-01 15:15 [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows) Alex Bennée
2023-03-01 15:15 ` [PULL v2 01/24] tests: don't run socat tests on MacOS as well Alex Bennée
2023-03-01 15:15 ` [PULL v2 02/24] tests: add socat dependency for tests Alex Bennée
2023-03-01 15:15 ` [PULL v2 03/24] tests: be a bit more strict cleaning up fifos Alex Bennée
2023-03-01 15:15 ` [PULL v2 04/24] tests: make fp-test less chatty when running from test suite Alex Bennée
2023-03-01 15:15 ` [PULL v2 05/24] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs Alex Bennée
2023-03-01 15:15 ` [PULL v2 06/24] gitlab: extend custom runners with base_job_template Alex Bennée
2023-03-01 15:15 ` [PULL v2 07/24] tests: don't run benchmarks for the tsan build Alex Bennée
2023-03-01 15:15 ` [PULL v2 08/24] testing: update ubuntu2004 to ubuntu2204 Alex Bennée
2023-03-01 15:15 ` [PULL v2 09/24] tests: skip the nios2 replay_kernel test Alex Bennée
2023-03-01 15:15 ` [PULL v2 10/24] tests: add tuxrun baseline test to avocado Alex Bennée
2023-03-01 15:15 ` [PULL v2 11/24] tests/docker: Use binaries for debian-tricore-cross Alex Bennée
2023-03-01 15:15 ` [PULL v2 12/24] tests: ensure we export job results for some cross builds Alex Bennée
2023-03-01 15:15 ` [PULL v2 13/24] cirrus.yml: Improve the windows_msys2_task Alex Bennée
2023-03-01 15:15 ` [PULL v2 14/24] tests/dockerfiles: unify debian-toolchain references Alex Bennée
2023-03-01 15:15 ` [PULL v2 15/24] gitlab: Use plain docker in container-template.yml Alex Bennée
2023-03-01 15:15 ` [PULL v2 16/24] tests: Ensure TAP version is printed before other messages Alex Bennée
2023-03-01 15:15 ` [PULL v2 17/24] configure: expose the direct container command Alex Bennée
2023-03-01 15:15 ` [PULL v2 18/24] tests/lcitool: append user setting stanza to dockerfiles Alex Bennée
2023-03-01 15:15 ` [PULL v2 19/24] tests/docker: add USER stanzas to non-lci images Alex Bennée
2023-03-01 15:16 ` Alex Bennée [this message]
2023-03-01 15:16 ` [PULL v2 21/24] tests/docker: use direct RUNC call to run test jobs Alex Bennée
2023-03-01 15:16 ` [PULL v2 22/24] gitlab: move the majority of artefact handling to a template Alex Bennée
2023-03-01 15:16 ` [PULL v2 23/24] tests/docker: add zstdtools to the images Alex Bennée
2023-03-01 15:16 ` [PULL v2 24/24] tests/avocado: disable BootLinuxPPC64 test in CI Alex Bennée
2023-03-01 17:39 ` [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows) Peter Maydell
2023-03-01 18:17 ` Alex Bennée
2023-03-01 19:19 ` Peter Maydell
2023-03-01 19:47 ` Alex Bennée
2023-03-02 10:56 ` Peter Maydell
2023-03-02 11:15 ` Philippe Mathieu-Daudé
2023-03-02 11:19 ` Thomas Huth
2023-03-02 11:21 ` Peter Maydell
2023-03-02 11:34 ` Alex Bennée
2023-03-02 11:24 ` Alex Bennée
2023-03-02 12:00 ` Daniel P. Berrangé
2023-03-02 12:37 ` Philippe Mathieu-Daudé
2023-03-02 11:30 ` Alex Bennée
2023-03-02 11:34 ` Peter Maydell
2023-03-02 12:03 ` Alex Bennée
2023-03-02 16:02 ` Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2023-03-01 16:43 [PULL v2 20/24] tests/docker: use direct RUNC call to build containers Akihiro Suda
2023-03-02 17:05 ` Alex Bennée
2023-03-02 23:04 ` Akihiro Suda
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=20230301151604.1948813-21-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/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).