From c6b8bb727303063161ade2c4fe6bda991544ea5d Mon Sep 17 00:00:00 2001 From: Enno Gotthold Date: Wed, 31 May 2023 10:19:28 +0200 Subject: [PATCH] spacewalk-java: Enable test makefile to work with podman --- java/Makefile.docker | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/Makefile.docker b/java/Makefile.docker index 1f77681ed088..ff232bc54230 100644 --- a/java/Makefile.docker +++ b/java/Makefile.docker @@ -2,6 +2,7 @@ # # Docker tests variables +EXECUTOR = docker DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master DOCKER_REGISTRY = registry.opensuse.org DOCKER_VOLUMES = -v "$(CURDIR)/../:/manager" @@ -14,8 +15,8 @@ DOCKER_ENV = all :: dockerrun_pg dockerpull :: - docker pull $(DOCKER_REGISTRY)/$(DOCKER_CONTAINER_BASE)-pgsql-4eclipse + $(EXECUTOR) pull $(DOCKER_REGISTRY)/$(DOCKER_CONTAINER_BASE)-pgsql-4eclipse dockerrun_pg :: cp buildconf/test/rhn.conf.postgresql-example buildconf/test/rhn.conf - docker run $(DOCKER_COMMON_OPTS) $(DOCKER_PG_PORTS) $(DOCKER_VOLUMES) $(DOCKER_ENV) $(DOCKER_REGISTRY)/$(DOCKER_CONTAINER_BASE)-pgsql-4eclipse + $(EXECUTOR) run $(DOCKER_COMMON_OPTS) $(DOCKER_PG_PORTS) $(DOCKER_VOLUMES) $(DOCKER_ENV) $(DOCKER_REGISTRY)/$(DOCKER_CONTAINER_BASE)-pgsql-4eclipse