On 9/25/23 16:48, Alex Bennée wrote:
> Since 0b1a649047 (tests/docker: use direct RUNC call to build
> containers) we ended up with the potential for the remaining docker.py
> script calls to deviate from the direct RUNC calls. Fix this by
> dropping the use of ENGINE in the makefile and rely entirely on what
> we detect at configure time.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> configure | 1 -
> tests/docker/Makefile.include | 7 ++-----
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index e08127045d..707132a3ae 100755
> --- a/configure
> +++ b/configure
> @@ -1694,7 +1694,6 @@ if test -n "$gdb_bin"; then
> fi
>
> if test "$container" != no; then
> - echo "ENGINE=$container" >> $config_host_mak
> echo "RUNC=$runc" >> $config_host_mak
> fi
> echo "SUBDIRS=$subdirs" >> $config_host_mak
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index dfabafab92..035d272be9 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -17,8 +17,7 @@ endif
> DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY))
>
> RUNC ?= docker
> -ENGINE ?= auto
This was used when using docker-* from the source directory. What about
changing it to:
RUNC ?= $(if $(shell command -v docker), docker, podman)
No complaint on removing ENGINE= though.
Paolo
> -DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE)
> +DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(RUNC)
>
> CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
> DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME)
> @@ -158,7 +157,7 @@ $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
> )
>
> docker:
> - @echo 'Build QEMU and run tests inside Docker or Podman containers'
> + @echo 'Build QEMU and run tests inside $(RUNC) containers'
> @echo
> @echo 'Available targets:'
> @echo
> @@ -198,8 +197,6 @@ docker:
> @echo ' EXECUTABLE=<path> Include executable in image.'
> @echo ' EXTRA_FILES="<path> [... <path>]"'
> @echo ' Include extra files in image.'
> - @echo ' ENGINE=auto/docker/podman'
> - @echo ' Specify which container engine to run.'
> @echo ' REGISTRY=url Cache builds from registry (default:$(DOCKER_REGISTRY))'
>
> docker-help: docker