spacewalk-java: Enable test makefile to work with podman

uyuni-project · May 31, 2023 · c6b8bb7 · c6b8bb7
1 parent 87b179a
commit c6b8bb7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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