From b3a861c0e00b409496ded5c774ac3cb2382f319b Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 1 May 2023 15:55:02 -0700 Subject: [PATCH] Move python builder/base images to quay.io We are moving our images to quay.io. This makes the move for our base python images. Note once we move these images we should attempt to quickly update any of the images that depend on these images. This will minimize the time period where we might be pulling outdated base images. Change-Id: I03c8053345abf6c94a8e904917f53caa5693ce89 --- docker/python-base/Dockerfile | 2 +- docker/python-builder/Dockerfile | 2 +- docker/uwsgi-base/Dockerfile | 4 +- .../docker-images/python-3.10-bullseye.yaml | 45 ++++++++++++------- .../docker-images/python-3.11-bullseye.yaml | 45 ++++++++++++------- zuul.d/docker-images/python-3.9-bullseye.yaml | 45 ++++++++++++------- 6 files changed, 94 insertions(+), 49 deletions(-) diff --git a/docker/python-base/Dockerfile b/docker/python-base/Dockerfile index cd339bcd17..3d9c62a683 100644 --- a/docker/python-base/Dockerfile +++ b/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 Tue Feb 7 17:57:17 UTC 2023 +# Comment to force rebuilds Mon May 1 22:23:27 UTC 2023 ARG PYTHON_VERSION=3.11 ARG DEBIAN_VERSION=bullseye diff --git a/docker/python-builder/Dockerfile b/docker/python-builder/Dockerfile index a2667c570b..688ec973b3 100644 --- a/docker/python-builder/Dockerfile +++ b/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 Tue Feb 7 17:57:17 UTC 2023 +# Comment to force rebuilds Mon May 1 22:23:27 UTC 2023 ARG PYTHON_VERSION=3.11 ARG DEBIAN_VERSION=bullseye diff --git a/docker/uwsgi-base/Dockerfile b/docker/uwsgi-base/Dockerfile index 2d28247b6a..6e95bd2f03 100644 --- a/docker/uwsgi-base/Dockerfile +++ b/docker/uwsgi-base/Dockerfile @@ -15,14 +15,14 @@ ARG PYTHON_VERSION=3.11 ARG DEBIAN_VERSION=bullseye -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 && \ diff --git a/zuul.d/docker-images/python-3.10-bullseye.yaml b/zuul.d/docker-images/python-3.10-bullseye.yaml index 5943cffc02..312195797d 100644 --- a/zuul.d/docker-images/python-3.10-bullseye.yaml +++ b/zuul.d/docker-images/python-3.10-bullseye.yaml @@ -2,15 +2,20 @@ - job: name: system-config-build-image-python-builder-3.10-bullseye description: Build a python-builder-3.10-bullseye image. - parent: system-config-build-image + parent: system-config-build-container-image timeout: 3600 provides: - python-builder-container-image - python-builder-3.10-bullseye-container-image vars: &python-builder_3_10_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-python-builder-3.10-bullseye + 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.10-bullseye arch: @@ -26,7 +31,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-image + parent: system-config-upload-container-image timeout: 3600 provides: - python-builder-container-image @@ -37,22 +42,27 @@ - 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-image + parent: system-config-promote-container-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-image + parent: system-config-build-container-image timeout: 3600 provides: - python-base-container-image - python-base-3.10-container-image vars: &python-base_3_10_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-python-base-3.10-bullseye + 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.10-bullseye arch: @@ -68,7 +78,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-image + parent: system-config-upload-container-image timeout: 3600 provides: python-base-3.10-bullseye-container-image vars: *python-base_3_10_bullseye_vars @@ -77,14 +87,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-image + parent: system-config-promote-container-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-image + parent: system-config-build-container-image timeout: 3600 requires: &uwsgi-base_3_10_bullseye_requires - python-base-3.10-bullseye-container-image @@ -96,9 +106,14 @@ - name: system-config-build-image-python-builder-3.10-bullseye soft: true vars: &uwsgi-base_3_10_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-uwsgi-base-3.10-bullseye + 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.10-bullseye arch: @@ -115,7 +130,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-image + parent: system-config-upload-container-image timeout: 3600 provides: uwsgi-base-3.10-bullseye-container-image requires: *uwsgi-base_3_10_bullseye_requires @@ -130,6 +145,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-image + parent: system-config-promote-container-image vars: *uwsgi-base_3_10_bullseye_vars files: *uwsgi-base_3_10_bullseye_files diff --git a/zuul.d/docker-images/python-3.11-bullseye.yaml b/zuul.d/docker-images/python-3.11-bullseye.yaml index 76bde759a1..1af3dc3ccd 100644 --- a/zuul.d/docker-images/python-3.11-bullseye.yaml +++ b/zuul.d/docker-images/python-3.11-bullseye.yaml @@ -2,15 +2,20 @@ - job: name: system-config-build-image-python-builder-3.11-bullseye description: Build a python-builder-3.11-bullseye image. - parent: system-config-build-image + parent: system-config-build-container-image timeout: 3600 provides: - python-builder-container-image - python-builder-3.11-bullseye-container-image vars: &python-builder_3_11_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-python-builder-3.11-bullseye + 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-bullseye arch: @@ -26,7 +31,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-image + parent: system-config-upload-container-image timeout: 3600 provides: - python-builder-container-image @@ -37,22 +42,27 @@ - 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-image + parent: system-config-promote-container-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-image + parent: system-config-build-container-image timeout: 3600 provides: - python-base-container-image - python-base-3.11-container-image vars: &python-base_3_11_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-python-base-3.11-bullseye + 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-bullseye arch: @@ -68,7 +78,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-image + parent: system-config-upload-container-image timeout: 3600 provides: python-base-3.11-bullseye-container-image vars: *python-base_3_11_bullseye_vars @@ -77,14 +87,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-image + parent: system-config-promote-container-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-image + parent: system-config-build-container-image timeout: 3600 requires: &uwsgi-base_3_11_bullseye_requires - python-base-3.11-bullseye-container-image @@ -96,9 +106,14 @@ - name: system-config-build-image-python-builder-3.11-bullseye soft: true vars: &uwsgi-base_3_11_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-uwsgi-base-3.11-bullseye + 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-bullseye arch: @@ -115,7 +130,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-image + parent: system-config-upload-container-image timeout: 3600 provides: uwsgi-base-3.11-bullseye-container-image requires: *uwsgi-base_3_11_bullseye_requires @@ -130,6 +145,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-image + parent: system-config-promote-container-image vars: *uwsgi-base_3_11_bullseye_vars files: *uwsgi-base_3_11_bullseye_files diff --git a/zuul.d/docker-images/python-3.9-bullseye.yaml b/zuul.d/docker-images/python-3.9-bullseye.yaml index 03f047c7d8..b86c31b225 100644 --- a/zuul.d/docker-images/python-3.9-bullseye.yaml +++ b/zuul.d/docker-images/python-3.9-bullseye.yaml @@ -2,15 +2,20 @@ - job: name: system-config-build-image-python-builder-3.9-bullseye description: Build a python-builder-3.9-bullseye image. - parent: system-config-build-image + parent: system-config-build-container-image timeout: 3600 provides: - python-builder-container-image - python-builder-3.9-bullseye-container-image vars: &python-builder_3_9_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-python-builder-3.9-bullseye + 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.9-bullseye arch: @@ -26,7 +31,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-image + parent: system-config-upload-container-image timeout: 3600 provides: - python-builder-container-image @@ -37,22 +42,27 @@ - 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-image + parent: system-config-promote-container-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-image + parent: system-config-build-container-image timeout: 3600 provides: - python-base-container-image - python-base-3.9-container-image vars: &python-base_3_9_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-python-base-3.9-bullseye + 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.9-bullseye arch: @@ -68,7 +78,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-image + parent: system-config-upload-container-image timeout: 3600 provides: python-base-3.9-bullseye-container-image vars: *python-base_3_9_bullseye_vars @@ -77,14 +87,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-image + parent: system-config-promote-container-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-image + parent: system-config-build-container-image timeout: 3600 requires: &uwsgi-base_3_9_bullseye_requires - python-base-3.9-bullseye-container-image @@ -96,9 +106,14 @@ - name: system-config-build-image-python-builder-3.9-bullseye soft: true vars: &uwsgi-base_3_9_bullseye_vars - docker_images: + promote_container_image_job: system-config-upload-image-uwsgi-base-3.9-bullseye + 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.9-bullseye arch: @@ -115,7 +130,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-image + parent: system-config-upload-container-image timeout: 3600 provides: uwsgi-base-3.9-bullseye-container-image requires: *uwsgi-base_3_9_bullseye_requires @@ -130,6 +145,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-image + parent: system-config-promote-container-image vars: *uwsgi-base_3_9_bullseye_vars files: *uwsgi-base_3_9_bullseye_files