Revert "Move python builder/base images to quay.io"

This reverts commit b3a861c0e0.

We found deficiencies in Docker when operating against images hosted
outside of docker.io. We are reverting as a result.

Change-Id: Ic690fc7ff9eb5b5ed9c1162d1f4b97edf6f2cd6c

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 May  1 22:23:27 UTC 2023
+# Comment to force rebuilds Wed May 24 17:17:08 UTC 2023
 
 ARG PYTHON_VERSION=3.11
 ARG DEBIAN_VERSION=bullseye

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 May  1 22:23:27 UTC 2023
+# Comment to force rebuilds Wed May 24 17:17:08 UTC 2023
 
 ARG PYTHON_VERSION=3.11
 ARG DEBIAN_VERSION=bullseye

docker/uwsgi-base/Dockerfile

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

zuul.d/docker-images/python-3.10-bullseye.yaml

@@ -2,20 +2,15 @@
 - job:
     name: system-config-build-image-python-builder-3.10-bullseye
     description: Build a python-builder-3.10-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     provides:
       - python-builder-container-image
       - python-builder-3.10-bullseye-container-image
     vars: &python-builder_3_10_bullseye_vars
-      promote_container_image_job: system-config-upload-image-python-builder-3.10-bullseye
+      docker_images:
-      container_images:
         - context: docker/python-builder
-          registry: quay.io
+          repository: opendevorg/python-builder
-          repository: quay.io/opendevorg/python-builder
-          namespace: opendevorg
-          repo_shortname: python-builder
-          repo_description: Python builder image for smaller prod python images.
           tags:
             - 3.10-bullseye
           arch:
@@ -31,7 +26,7 @@
 - job:
     name: system-config-upload-image-python-builder-3.10-bullseye
     description: Build and upload a python-builder-3.10-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides:
       - python-builder-container-image
@@ -42,27 +37,22 @@
 - job:
     name: system-config-promote-image-python-builder-3.10-bullseye
     description: Promote a previously published python-builder-3.10-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *python-builder_3_10_bullseye_vars
     files: *python-builder_3_10_bullseye_files
 
 - job:
     name: system-config-build-image-python-base-3.10-bullseye
     description: Build a python-base-3.10-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     provides:
       - python-base-container-image
       - python-base-3.10-container-image
     vars: &python-base_3_10_bullseye_vars
-      promote_container_image_job: system-config-upload-image-python-base-3.10-bullseye
+      docker_images:
-      container_images:
         - context: docker/python-base
-          registry: quay.io
+          repository: opendevorg/python-base
-          repository: quay.io/opendevorg/python-base
-          namespace: opendevorg
-          repo_shortname: python-base
-          repo_description: Minimal python production image.
           tags:
             - 3.10-bullseye
           arch:
@@ -78,7 +68,7 @@
 - job:
     name: system-config-upload-image-python-base-3.10-bullseye
     description: Build and upload a python-base-3.10-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides: python-base-3.10-bullseye-container-image
     vars: *python-base_3_10_bullseye_vars
@@ -87,14 +77,14 @@
 - job:
     name: system-config-promote-image-python-base-3.10-bullseye
     description: Promote a previously published python-base-3.10-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *python-base_3_10_bullseye_vars
     files: *python-base_3_10_bullseye_files
 
 - job:
     name: system-config-build-image-uwsgi-base-3.10-bullseye
     description: Build a uwsgi-base-3.10-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     requires: &uwsgi-base_3_10_bullseye_requires
       - python-base-3.10-bullseye-container-image
@@ -106,14 +96,9 @@
       - name: system-config-build-image-python-builder-3.10-bullseye
         soft: true
     vars: &uwsgi-base_3_10_bullseye_vars
-      promote_container_image_job: system-config-upload-image-uwsgi-base-3.10-bullseye
+      docker_images:
-      container_images:
         - context: docker/uwsgi-base
-          registry: quay.io
+          repository: opendevorg/uwsgi-base
-          repository: quay.io/opendevorg/uwsgi-base
-          namespace: opendevorg
-          repo_shortname: uwsgi-base
-          repo_description: Minimal UWSGI production image.
           tags:
             - 3.10-bullseye
           arch:
@@ -130,7 +115,7 @@
 - job:
     name: system-config-upload-image-uwsgi-base-3.10-bullseye
     description: Build and upload a uwsgi-base-3.10-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides: uwsgi-base-3.10-bullseye-container-image
     requires: *uwsgi-base_3_10_bullseye_requires
@@ -145,6 +130,6 @@
 - job:
     name: system-config-promote-image-uwsgi-base-3.10-bullseye
     description: Promote a previously published uwsgi-base-3.10-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *uwsgi-base_3_10_bullseye_vars
     files: *uwsgi-base_3_10_bullseye_files

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

@@ -2,20 +2,15 @@
 - job:
     name: system-config-build-image-python-builder-3.11-bullseye
     description: Build a python-builder-3.11-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     provides:
       - python-builder-container-image
       - python-builder-3.11-bullseye-container-image
     vars: &python-builder_3_11_bullseye_vars
-      promote_container_image_job: system-config-upload-image-python-builder-3.11-bullseye
+      docker_images:
-      container_images:
         - context: docker/python-builder
-          registry: quay.io
+          repository: opendevorg/python-builder
-          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-bullseye
           arch:
@@ -31,7 +26,7 @@
 - job:
     name: system-config-upload-image-python-builder-3.11-bullseye
     description: Build and upload a python-builder-3.11-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides:
       - python-builder-container-image
@@ -42,27 +37,22 @@
 - job:
     name: system-config-promote-image-python-builder-3.11-bullseye
     description: Promote a previously published python-builder-3.11-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *python-builder_3_11_bullseye_vars
     files: *python-builder_3_11_bullseye_files
 
 - job:
     name: system-config-build-image-python-base-3.11-bullseye
     description: Build a python-base-3.11-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     provides:
       - python-base-container-image
       - python-base-3.11-container-image
     vars: &python-base_3_11_bullseye_vars
-      promote_container_image_job: system-config-upload-image-python-base-3.11-bullseye
+      docker_images:
-      container_images:
         - context: docker/python-base
-          registry: quay.io
+          repository: opendevorg/python-base
-          repository: quay.io/opendevorg/python-base
-          namespace: opendevorg
-          repo_shortname: python-base
-          repo_description: Minimal python production image.
           tags:
             - 3.11-bullseye
           arch:
@@ -78,7 +68,7 @@
 - job:
     name: system-config-upload-image-python-base-3.11-bullseye
     description: Build and upload a python-base-3.11-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides: python-base-3.11-bullseye-container-image
     vars: *python-base_3_11_bullseye_vars
@@ -87,14 +77,14 @@
 - job:
     name: system-config-promote-image-python-base-3.11-bullseye
     description: Promote a previously published python-base-3.11-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *python-base_3_11_bullseye_vars
     files: *python-base_3_11_bullseye_files
 
 - job:
     name: system-config-build-image-uwsgi-base-3.11-bullseye
     description: Build a uwsgi-base-3.11-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     requires: &uwsgi-base_3_11_bullseye_requires
       - python-base-3.11-bullseye-container-image
@@ -106,14 +96,9 @@
       - name: system-config-build-image-python-builder-3.11-bullseye
         soft: true
     vars: &uwsgi-base_3_11_bullseye_vars
-      promote_container_image_job: system-config-upload-image-uwsgi-base-3.11-bullseye
+      docker_images:
-      container_images:
         - context: docker/uwsgi-base
-          registry: quay.io
+          repository: opendevorg/uwsgi-base
-          repository: quay.io/opendevorg/uwsgi-base
-          namespace: opendevorg
-          repo_shortname: uwsgi-base
-          repo_description: Minimal UWSGI production image.
           tags:
             - 3.11-bullseye
           arch:
@@ -130,7 +115,7 @@
 - job:
     name: system-config-upload-image-uwsgi-base-3.11-bullseye
     description: Build and upload a uwsgi-base-3.11-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides: uwsgi-base-3.11-bullseye-container-image
     requires: *uwsgi-base_3_11_bullseye_requires
@@ -145,6 +130,6 @@
 - job:
     name: system-config-promote-image-uwsgi-base-3.11-bullseye
     description: Promote a previously published uwsgi-base-3.11-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *uwsgi-base_3_11_bullseye_vars
     files: *uwsgi-base_3_11_bullseye_files

zuul.d/docker-images/python-3.9-bullseye.yaml

@@ -2,20 +2,15 @@
 - job:
     name: system-config-build-image-python-builder-3.9-bullseye
     description: Build a python-builder-3.9-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     provides:
       - python-builder-container-image
       - python-builder-3.9-bullseye-container-image
     vars: &python-builder_3_9_bullseye_vars
-      promote_container_image_job: system-config-upload-image-python-builder-3.9-bullseye
+      docker_images:
-      container_images:
         - context: docker/python-builder
-          registry: quay.io
+          repository: opendevorg/python-builder
-          repository: quay.io/opendevorg/python-builder
-          namespace: opendevorg
-          repo_shortname: python-builder
-          repo_description: Python builder image for smaller prod python images.
           tags:
             - 3.9-bullseye
           arch:
@@ -31,7 +26,7 @@
 - job:
     name: system-config-upload-image-python-builder-3.9-bullseye
     description: Build and upload a python-builder-3.9-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides:
       - python-builder-container-image
@@ -42,27 +37,22 @@
 - job:
     name: system-config-promote-image-python-builder-3.9-bullseye
     description: Promote a previously published python-builder-3.9-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *python-builder_3_9_bullseye_vars
     files: *python-builder_3_9_bullseye_files
 
 - job:
     name: system-config-build-image-python-base-3.9-bullseye
     description: Build a python-base-3.9-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     provides:
       - python-base-container-image
       - python-base-3.9-container-image
     vars: &python-base_3_9_bullseye_vars
-      promote_container_image_job: system-config-upload-image-python-base-3.9-bullseye
+      docker_images:
-      container_images:
         - context: docker/python-base
-          registry: quay.io
+          repository: opendevorg/python-base
-          repository: quay.io/opendevorg/python-base
-          namespace: opendevorg
-          repo_shortname: python-base
-          repo_description: Minimal python production image.
           tags:
             - 3.9-bullseye
           arch:
@@ -78,7 +68,7 @@
 - job:
     name: system-config-upload-image-python-base-3.9-bullseye
     description: Build and upload a python-base-3.9-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides: python-base-3.9-bullseye-container-image
     vars: *python-base_3_9_bullseye_vars
@@ -87,14 +77,14 @@
 - job:
     name: system-config-promote-image-python-base-3.9-bullseye
     description: Promote a previously published python-base-3.9-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *python-base_3_9_bullseye_vars
     files: *python-base_3_9_bullseye_files
 
 - job:
     name: system-config-build-image-uwsgi-base-3.9-bullseye
     description: Build a uwsgi-base-3.9-bullseye image.
-    parent: system-config-build-container-image
+    parent: system-config-build-image
     timeout: 3600
     requires: &uwsgi-base_3_9_bullseye_requires
       - python-base-3.9-bullseye-container-image
@@ -106,14 +96,9 @@
       - name: system-config-build-image-python-builder-3.9-bullseye
         soft: true
     vars: &uwsgi-base_3_9_bullseye_vars
-      promote_container_image_job: system-config-upload-image-uwsgi-base-3.9-bullseye
+      docker_images:
-      container_images:
         - context: docker/uwsgi-base
-          registry: quay.io
+          repository: opendevorg/uwsgi-base
-          repository: quay.io/opendevorg/uwsgi-base
-          namespace: opendevorg
-          repo_shortname: uwsgi-base
-          repo_description: Minimal UWSGI production image.
           tags:
             - 3.9-bullseye
           arch:
@@ -130,7 +115,7 @@
 - job:
     name: system-config-upload-image-uwsgi-base-3.9-bullseye
     description: Build and upload a uwsgi-base-3.9-bullseye image.
-    parent: system-config-upload-container-image
+    parent: system-config-upload-image
     timeout: 3600
     provides: uwsgi-base-3.9-bullseye-container-image
     requires: *uwsgi-base_3_9_bullseye_requires
@@ -145,6 +130,6 @@
 - job:
     name: system-config-promote-image-uwsgi-base-3.9-bullseye
     description: Promote a previously published uwsgi-base-3.9-bullseye image to latest.
-    parent: system-config-promote-container-image
+    parent: system-config-promote-image
     vars: *uwsgi-base_3_9_bullseye_vars
     files: *uwsgi-base_3_9_bullseye_files