Move python base images back to quay.io

All of our python based containers are running on Ubuntu Noble now which
means we can run them with specualtive image testing when hosting the
images on quay.io. Move the python base images over to match.

Note that we continue to build the container images with docker, but
use-buildset-registry configures buildkit (which is the default docker
image builder) to use mirrors properly. The image build process doesn't
have the same problems as the runtime execution of containers when it
comes to using mirrors for different registries. What this means is
everything should work as expected. The uwsgi-base python3.12 image
build should exercise this within this change. There is no existing
python3.12 image on quay.io for python-builder and python-base which
uwsgi-base uses to build its python3.12 image. This means it will be
forced to use speculative image builds.

Change-Id: I06c3dd0008a5095e7a1c44977625c907ab9c1b83

docker/python-base/Dockerfile

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Comment to force rebuilds Mon Mar 17 04:53:44 PM UTC 2025
+# Comment to force rebuilds Wed Aug 13 06:41:57 PM UTC 2025
 
 ARG PYTHON_VERSION=3.11
 ARG DEBIAN_VERSION=bookworm

docker/python-builder/Dockerfile

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Comment to force rebuilds Mon Mar 17 04:53:44 PM UTC 2025
+# Comment to force rebuilds Wed Aug 13 06:41:57 PM UTC 2025
 
 ARG PYTHON_VERSION=3.11
 ARG DEBIAN_VERSION=bookworm

docker/uwsgi-base/Dockerfile

@@ -17,14 +17,14 @@
 
 ARG PYTHON_VERSION=3.11
 ARG DEBIAN_VERSION=bookworm
-FROM docker.io/opendevorg/python-builder:${PYTHON_VERSION}-${DEBIAN_VERSION} as builder
+FROM quay.io/opendevorg/python-builder:${PYTHON_VERSION}-${DEBIAN_VERSION} as builder
 
 ARG PYTHON_VERSION
 
 COPY . /tmp/src
 RUN assemble uWSGI
 
-FROM docker.io/opendevorg/python-base:${PYTHON_VERSION}-${DEBIAN_VERSION}
+FROM quay.io/opendevorg/python-base:${PYTHON_VERSION}-${DEBIAN_VERSION}
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep && \

zuul.d/docker-images/python-3.11-bookworm.yaml

@@ -2,15 +2,21 @@
 - job:
     name: system-config-build-image-python-builder-3.11-bookworm
     description: Build a python-builder-3.11-bookworm image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     provides:
       - python-builder-container-image
       - python-builder-3.11-bookworm-container-image
     vars: &python-builder_3_11_bookworm_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-python-builder-3.11-bookworm
+      container_command: docker
+      container_images:
         - context: docker/python-builder
-          repository: opendevorg/python-builder
+          registry: quay.io
+          repository: quay.io/opendevorg/python-builder
+          namespace: opendevorg
+          repo_shortname: python-builder
+          repo_description: Python builder image for smaller prod python images.
           tags:
             - 3.11-bookworm
           arch:
@@ -27,7 +33,7 @@
 - job:
     name: system-config-upload-image-python-builder-3.11-bookworm
     description: Build and upload a python-builder-3.11-bookworm image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides:
       - python-builder-container-image
@@ -38,7 +44,7 @@
 - job:
     name: system-config-promote-image-python-builder-3.11-bookworm
     description: Promote a previously published python-builder-3.11-bookworm image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *python-builder_3_11_bookworm_vars
     files: *python-builder_3_11_bookworm_files
 
@@ -46,15 +52,21 @@
 - job:
     name: system-config-build-image-python-base-3.11-bookworm
     description: Build a python-base-3.11-bookworm image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     provides:
       - python-base-container-image
       - python-base-3.11-bookworm-container-image
     vars: &python-base_3_11_bookworm_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-python-base-3.11-bookworm
+      container_command: docker
+      container_images:
         - context: docker/python-base
-          repository: opendevorg/python-base
+          registry: quay.io
+          repository: quay.io/opendevorg/python-base
+          namespace: opendevorg
+          repo_shortname: python-base
+          repo_description: Minimal python production image.
           tags:
             - 3.11-bookworm
           arch:
@@ -71,7 +83,7 @@
 - job:
     name: system-config-upload-image-python-base-3.11-bookworm
     description: Build and upload a python-base-3.11-bookworm image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides: python-base-3.11-bookworm-container-image
     vars: *python-base_3_11_bookworm_vars
@@ -80,7 +92,7 @@
 - job:
     name: system-config-promote-image-python-base-3.11-bookworm
     description: Promote a previously published python-base-3.11-bookworm image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *python-base_3_11_bookworm_vars
     files: *python-base_3_11_bookworm_files
 
@@ -88,14 +100,20 @@
 - job:
     name: system-config-build-image-python-base-3.11-bookworm-debug
     description: Build a python-base-3.11-bookworm debug image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     provides:
       - python-base-3.11-bookworm-debug-container-image
     vars: &python-base_3_11_bookworm_debug_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-python-base-3.11-bookworm-debug
+      container_command: docker
+      container_images:
         - context: docker/python-base
-          repository: opendevorg/python-base
+          registry: quay.io
+          repository: quay.io/opendevorg/python-base
+          namespace: opendevorg
+          repo_shortname: python-base
+          repo_description: Minimal python production image.
           tags:
             - 3.11-bookworm-debug
           arch:
@@ -114,7 +132,7 @@
 - job:
     name: system-config-upload-image-python-base-3.11-bookworm-debug
     description: Build and upload a python-base-3.11-bookworm debug image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides: python-base-3.11-bookworm-debug-container-image
     vars: *python-base_3_11_bookworm_debug_vars
@@ -123,7 +141,7 @@
 - job:
     name: system-config-promote-image-python-base-3.11-bookworm-debug
     description: Promote a previously published python-base-3.11-bookworm debug image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *python-base_3_11_bookworm_debug_vars
     files: *python-base_3_11_bookworm_debug_files
 
@@ -131,7 +149,7 @@
 - job:
     name: system-config-build-image-uwsgi-base-3.11-bookworm
     description: Build a uwsgi-base-3.11-bookworm image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     requires: &uwsgi-base_3_11_bookworm_requires
       - python-base-3.11-bookworm-container-image
@@ -143,9 +161,15 @@
       - name: system-config-build-image-python-builder-3.11-bookworm
         soft: true
     vars: &uwsgi-base_3_11_bookworm_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-uwsgi-base-3.11-bookworm
+      container_command: docker
+      container_images:
         - context: docker/uwsgi-base
-          repository: opendevorg/uwsgi-base
+          registry: quay.io
+          repository: quay.io/opendevorg/uwsgi-base
+          namespace: opendevorg
+          repo_shortname: uwsgi-base
+          repo_description: Minimal UWSGI production image.
           tags:
             - 3.11-bookworm
           arch:
@@ -162,7 +186,7 @@
 - job:
     name: system-config-upload-image-uwsgi-base-3.11-bookworm
     description: Build and upload a uwsgi-base-3.11-bookworm image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides: uwsgi-base-3.11-bookworm-container-image
     requires: *uwsgi-base_3_11_bookworm_requires
@@ -177,6 +201,6 @@
 - job:
     name: system-config-promote-image-uwsgi-base-3.11-bookworm
     description: Promote a previously published uwsgi-base-3.11-bookworm image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *uwsgi-base_3_11_bookworm_vars
     files: *uwsgi-base_3_11_bookworm_files

zuul.d/docker-images/python-3.12-bookworm.yaml

@@ -2,15 +2,21 @@
 - job:
     name: system-config-build-image-python-builder-3.12-bookworm
     description: Build a python-builder-3.12-bookworm image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     provides:
       - python-builder-container-image
       - python-builder-3.12-bookworm-container-image
     vars: &python-builder_3_12_bookworm_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-python-builder-3.12-bookworm
+      container_command: docker
+      container_images:
         - context: docker/python-builder
-          repository: opendevorg/python-builder
+          registry: quay.io
+          repository: quay.io/opendevorg/python-builder
+          namespace: opendevorg
+          repo_shortname: python-builder
+          repo_description: Python builder image for smaller prod python images.
           tags:
             - 3.12-bookworm
           arch:
@@ -27,7 +33,7 @@
 - job:
     name: system-config-upload-image-python-builder-3.12-bookworm
     description: Build and upload a python-builder-3.12-bookworm image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides:
       - python-builder-container-image
@@ -38,7 +44,7 @@
 - job:
     name: system-config-promote-image-python-builder-3.12-bookworm
     description: Promote a previously published python-builder-3.12-bookworm image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *python-builder_3_12_bookworm_vars
     files: *python-builder_3_12_bookworm_files
 
@@ -46,15 +52,21 @@
 - job:
     name: system-config-build-image-python-base-3.12-bookworm
     description: Build a python-base-3.12-bookworm image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     provides:
       - python-base-container-image
       - python-base-3.12-bookworm-container-image
     vars: &python-base_3_12_bookworm_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-python-base-3.12-bookworm
+      container_command: docker
+      container_images:
         - context: docker/python-base
-          repository: opendevorg/python-base
+          registry: quay.io
+          repository: quay.io/opendevorg/python-base
+          namespace: opendevorg
+          repo_shortname: python-base
+          repo_description: Minimal python production image.
           tags:
             - 3.12-bookworm
           arch:
@@ -71,7 +83,7 @@
 - job:
     name: system-config-upload-image-python-base-3.12-bookworm
     description: Build and upload a python-base-3.12-bookworm image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides: python-base-3.12-bookworm-container-image
     vars: *python-base_3_12_bookworm_vars
@@ -80,7 +92,7 @@
 - job:
     name: system-config-promote-image-python-base-3.12-bookworm
     description: Promote a previously published python-base-3.12-bookworm image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *python-base_3_12_bookworm_vars
     files: *python-base_3_12_bookworm_files
 
@@ -88,14 +100,20 @@
 - job:
     name: system-config-build-image-python-base-3.12-bookworm-debug
     description: Build a python-base-3.12-bookworm debug image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     provides:
       - python-base-3.12-bookworm-debug-container-image
     vars: &python-base_3_12_bookworm_debug_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-python-base-3.12-bookworm-debug
+      container_command: docker
+      container_images:
         - context: docker/python-base
-          repository: opendevorg/python-base
+          registry: quay.io
+          repository: quay.io/opendevorg/python-base
+          namespace: opendevorg
+          repo_shortname: python-base
+          repo_description: Minimal python production image.
           tags:
             - 3.12-bookworm-debug
           arch:
@@ -114,7 +132,7 @@
 - job:
     name: system-config-upload-image-python-base-3.12-bookworm-debug
     description: Build and upload a python-base-3.12-bookworm debug image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides: python-base-3.12-bookworm-debug-container-image
     vars: *python-base_3_12_bookworm_debug_vars
@@ -123,7 +141,7 @@
 - job:
     name: system-config-promote-image-python-base-3.12-bookworm-debug
     description: Promote a previously published python-base-3.12-bookworm debug image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *python-base_3_12_bookworm_debug_vars
     files: *python-base_3_12_bookworm_debug_files
 
@@ -131,7 +149,7 @@
 - job:
     name: system-config-build-image-uwsgi-base-3.12-bookworm
     description: Build a uwsgi-base-3.12-bookworm image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     timeout: 3600
     requires: &uwsgi-base_3_12_bookworm_requires
       - python-base-3.12-bookworm-container-image
@@ -143,9 +161,15 @@
       - name: system-config-build-image-python-builder-3.12-bookworm
         soft: true
     vars: &uwsgi-base_3_12_bookworm_vars
-      docker_images:
+      promote_container_image_job: system-config-promote-image-uwsgi-base-3.12-bookworm
+      container_command: docker
+      container_images:
         - context: docker/uwsgi-base
-          repository: opendevorg/uwsgi-base
+          registry: quay.io
+          repository: quay.io/opendevorg/uwsgi-base
+          namespace: opendevorg
+          repo_shortname: uwsgi-base
+          repo_description: Minimal UWSGI production image.
           tags:
             - 3.12-bookworm
           arch:
@@ -162,7 +186,7 @@
 - job:
     name: system-config-upload-image-uwsgi-base-3.12-bookworm
     description: Build and upload a uwsgi-base-3.12-bookworm image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     timeout: 3600
     provides: uwsgi-base-3.12-bookworm-container-image
     requires: *uwsgi-base_3_12_bookworm_requires
@@ -177,6 +201,6 @@
 - job:
     name: system-config-promote-image-uwsgi-base-3.12-bookworm
     description: Promote a previously published uwsgi-base-3.12-bookworm image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *uwsgi-base_3_12_bookworm_vars
     files: *uwsgi-base_3_12_bookworm_files