From 246b79e598e9efeeb74928ce9a53208f5e5134fc Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 16 Sep 2025 12:44:00 -0700 Subject: [PATCH] Switch generic container role image builds back to docker At some point about half a year ago I switched this to podman thinking it would make things easier. Since then we figured out how to make docker builds execute speculatively which is good because we currently need docker image builds for multiarch support. When I switched everything over to pull the now quay published base images I switched them to use docker explicitly. This means that all of our images are now built by docker (good for consistency). In order to ensure that new images that we add don't accidentally use podman switch the default in the base container image build job to docker as well. Change-Id: Id1d491f9ebb2d45ba04abfac0a70d5706b5275c0 --- zuul.d/docker-images/base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zuul.d/docker-images/base.yaml b/zuul.d/docker-images/base.yaml index f95cf49f89..50b967fc78 100644 --- a/zuul.d/docker-images/base.yaml +++ b/zuul.d/docker-images/base.yaml @@ -89,7 +89,7 @@ docker_mirror_base_url: "https://{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }}" zuul_work_dir: "{{ zuul.projects['opendev.org/opendev/system-config'].src_dir }}" promote_container_image_method: intermediate-registry - container_command: podman + container_command: docker - job: name: system-config-upload-container-image