From 5ca652888ef9ef48d4642dab067690f5efb87c54 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 26 Aug 2025 15:16:23 -0700
Subject: [PATCH] Build gerrit image with python base from quay.io

The parent change moves publication of these base python images to
quay.io. Update the Gerrit image builds to pull these images from
quay.io to match.

We switch to building with docker now that docker is capable of
building with speculative images in single arch builds.

Change-Id: Ie48f8dedf2c4aed86e098723acd3e499be9b680d
---
 docker/gerrit/base/Dockerfile    | 4 ++--
 zuul.d/docker-images/gerrit.yaml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 39cf2ae398..b974c7588d 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -15,12 +15,12 @@
 
 # Fri Jul 18 10:35:03 AM PDT 2025 - trigger rebuild
 
-FROM docker.io/opendevorg/python-builder:3.12-bookworm as builder
+FROM quay.io/opendevorg/python-builder:3.12-bookworm as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.12-bookworm as gerrit-base
+FROM quay.io/opendevorg/python-base:3.12-bookworm as gerrit-base
 
 RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends
 
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index 383c28e3ca..a216ba5054 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -14,6 +14,7 @@
       - playbooks/zuul/gerrit/base.yaml
     vars: &gerrit-base_vars
       promote_container_image_job: system-config-upload-image-gerrit-base
+      container_command: docker
       container_images:
         - context: docker/gerrit/base
           registry: quay.io
@@ -109,6 +110,7 @@
         override-checkout: v3.10.7
     vars: &gerrit_vars_3_10
       promote_container_image_job: system-config-upload-image-gerrit-3.10
+      container_command: docker
       container_images:
         - context: docker/gerrit/bazel
           registry: quay.io
@@ -210,6 +212,7 @@
         override-checkout: v3.11.4
     vars: &gerrit_vars_3_11
       promote_container_image_job: system-config-upload-image-gerrit-3.11
+      container_command: docker
       container_images:
         - context: docker/gerrit/bazel
           registry: quay.io
@@ -296,6 +299,7 @@
     vars: &gerrit_vars_master
       zuul_work_dir: src/opendev.org/opendev/system-config
       promote_container_image_job: system-config-upload-image-gerrit-master
+      container_command: docker
       container_images:
         - context: docker/gerrit/bazel
           registry: quay.io