Migrate ptgbot to quay.io

This migrates publication of ptgbot container images to quay.io. We also
update the source of the opendev python base images to quay.io.

Depends-On: https://review.opendev.org/c/opendev/system-config/+/881932
Change-Id: Ia23aa05e770d0f002ce74effdae08dacb6edc18a
This commit is contained in:
Clark Boylan 2023-05-05 15:15:21 -07:00
parent 7b6b8293a8
commit 89b9c27e05
2 changed files with 22 additions and 23 deletions

View File

@ -1,22 +1,14 @@
- secret: - secret:
name: ptgbot-opendev-dockerhub name: ptgbot-opendev-quayio
data: data:
quay.io:
username: opendevzuul username: opendevzuul
password: !encrypted/pkcs1-oaep password: TODO
- tpQrxd7cqPwjjKsSbDOH0GqNuFZudJDQvY43qFV8tmKh3zRTjfA5uVX5b3J60SHHYIez9 # No api token as we won't need to create new repos for ptgbot
9W/SU0pVm0VfH0iL9plMKoVij6LLpFlxGePiab7SimjQuiDoP2aBles7AbmdCxyNrs6M5
WCHSsg+6bE79z0r2+2+yoFYxGlbY7beRpHXkPxGpFn/g9YpOFnAch3UcnAEDnZHamxufp
8wIZ//UYP4Z6hwv0PcX9caw/MU8bnUGDQXBtjErohtsi8+cELKXvHBT4WU33wpf//C6MD
KQ3nd7NJfDtIYaN4PGOw2mlbQFq0lF4PfxlhOHjC2+k9vz+EoW85Hkfcw986CE+JINq3p
k5t8GbXTDu86kkBzU6Gk+D7EVOluKZbGuTB4pcyZdjlMbty274y8xQXnplTp2rKIAdPeP
G1AcXEvZmfR0YEKg8UuR+ZJQx3Au1uEJAEpkNwH1Tbt54K/qyw1gAQDcHHkJ3odsKJe5V
c97Kn7roGCzwi7UWOd+XR0hvcNTUfotyBFQJzDe1+NHc6IQGQ1DeBVz5FD1JIVoj+W65E
XymsiQmZ+B+AxFnINS8PUTkJtlQc7zoMP/dtcYTbxtJB3XJQTOiaD00KGmr6RDWu3Uuw+
T6l/0vVdT7SeDY0v5wib2Elgl1Vnmxkte9oiUD9F++dW/rw42Cjlq5WqRlodaU=
- job: - job:
name: ptgbot-build-opendev-image name: ptgbot-build-opendev-image
parent: opendev-build-docker-image parent: opendev-build-container-image
description: Build OpenDev Docker images for statusbot description: Build OpenDev Docker images for statusbot
requires: requires:
- python-builder-3.9-bullseye-container-image - python-builder-3.9-bullseye-container-image
@ -24,14 +16,21 @@
provides: ptgbot-container-image provides: ptgbot-container-image
vars: &ptgbot_opendev_image_vars vars: &ptgbot_opendev_image_vars
zuul_work_dir: src/opendev.org/openstack/ptgbot zuul_work_dir: src/opendev.org/openstack/ptgbot
docker_images: promote_container_image_method: intermediate-registry
promote_container_image_job: ptgbot-upload-opendev-image
container_command: docker
container_images:
- context: . - context: .
registry: quay.io
repository: opendevorg/ptgbot repository: opendevorg/ptgbot
namespace: opendevorg
repo_shortname: ptgbot
repo_description: An IRC bot for managing team gatherings
target: ptgbot target: ptgbot
- job: - job:
name: ptgbot-upload-opendev-image name: ptgbot-upload-opendev-image
parent: opendev-upload-docker-image parent: opendev-upload-container-image
description: Build OpenDev statusbot Docker images and upload to Docker Hub. description: Build OpenDev statusbot Docker images and upload to Docker Hub.
requires: requires:
- python-builder-3.9-bullseye-container-image - python-builder-3.9-bullseye-container-image
@ -39,18 +38,18 @@
provides: ptgbot-container-image provides: ptgbot-container-image
vars: *ptgbot_opendev_image_vars vars: *ptgbot_opendev_image_vars
secrets: secrets:
- name: docker_credentials - name: container_registry_credentials
secret: ptgbot-opendev-dockerhub secret: ptgbot-opendev-quayio
pass-to-parent: true pass-to-parent: true
- job: - job:
name: ptgbot-promote-opendev-image name: ptgbot-promote-opendev-image
parent: opendev-promote-docker-image parent: opendev-promote-container-image
description: Promote previously uploaded ptgbot Docker images. description: Promote previously uploaded ptgbot Docker images.
vars: *ptgbot_opendev_image_vars vars: *ptgbot_opendev_image_vars
secrets: secrets:
- name: docker_credentials - name: container_registry_credentials
secret: ptgbot-opendev-dockerhub secret: ptgbot-opendev-quayio
pass-to-parent: true pass-to-parent: true
- project: - project:
check: check:

View File

@ -1,10 +1,10 @@
FROM opendevorg/python-builder:3.9-bullseye as builder FROM quay.io/opendevorg/python-builder:3.9-bullseye as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM opendevorg/python-base:3.9-bullseye as ptgbot FROM quay.io/opendevorg/python-base:3.9-bullseye as ptgbot
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep