From 8ccab5e9678341537a10098eb15bf8a57a01d6a8 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 24 May 2023 13:16:19 -0700 Subject: [PATCH] Revert "Move system-config irc bots into quay.io" This reverts commit 5842ce3ea61db14ce450b8ec9a19eb744f58fb2f. OpenDev is moving back to docker.io in order to keep functional speculative container image testing. Change-Id: I748772eb92ddb608df8e10b84ce814ae17af9e18 --- docker/accessbot/Dockerfile | 2 +- docker/ircbot/Dockerfile | 4 ++-- docker/matrix-eavesdrop/Dockerfile | 4 ++-- playbooks/roles/accessbot/files/accessbot | 2 +- playbooks/roles/accessbot/tasks/main.yaml | 2 +- .../roles/limnoria/files/docker-compose.yaml | 2 +- .../matrix-eavesdrop/files/docker-compose.yaml | 2 +- zuul.d/docker-images/accessbot.yaml | 15 +++++---------- zuul.d/docker-images/eavesdrop.yaml | 15 +++++---------- zuul.d/docker-images/ircbot.yaml | 15 +++++---------- 10 files changed, 24 insertions(+), 39 deletions(-) diff --git a/docker/accessbot/Dockerfile b/docker/accessbot/Dockerfile index 75f166f425..5b7fb61bf7 100644 --- a/docker/accessbot/Dockerfile +++ b/docker/accessbot/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/opendevorg/python-base:3.11-bullseye +FROM docker.io/opendevorg/python-base:3.11-bullseye RUN pip install pyyaml irc COPY accessbot.py /usr/local/bin/accessbot.py diff --git a/docker/ircbot/Dockerfile b/docker/ircbot/Dockerfile index 5e9eeb018d..79389adda3 100644 --- a/docker/ircbot/Dockerfile +++ b/docker/ircbot/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/opendevorg/python-builder:3.9-bullseye as builder +FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder ARG ZUUL_SIBLINGS="" RUN apt-get update \ @@ -25,7 +25,7 @@ COPY . /tmp/src RUN assemble -FROM quay.io/opendevorg/python-base:3.9-bullseye as ircbot +FROM docker.io/opendevorg/python-base:3.9-bullseye as ircbot COPY --from=builder /output /output diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile index 0427fbdf5e..fc43e91806 100644 --- a/docker/matrix-eavesdrop/Dockerfile +++ b/docker/matrix-eavesdrop/Dockerfile @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/opendevorg/python-builder:3.9-bullseye as builder +FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder COPY src /tmp/src RUN assemble -FROM quay.io/opendevorg/python-base:3.9-bullseye as eavesdrop +FROM docker.io/opendevorg/python-base:3.9-bullseye as eavesdrop COPY --from=builder /output/ /output RUN /output/install-from-bindep \ diff --git a/playbooks/roles/accessbot/files/accessbot b/playbooks/roles/accessbot/files/accessbot index 6da815b8ad..f21506ee4c 100644 --- a/playbooks/roles/accessbot/files/accessbot +++ b/playbooks/roles/accessbot/files/accessbot @@ -17,4 +17,4 @@ exec docker run --rm --net=host \ -v/etc/accessbot:/etc/accessbot \ -v/var/log/accessbot:/var/log/accessbot \ - quay.io/opendevorg/accessbot + docker.io/opendevorg/accessbot diff --git a/playbooks/roles/accessbot/tasks/main.yaml b/playbooks/roles/accessbot/tasks/main.yaml index 07c230d42d..08beff9dad 100644 --- a/playbooks/roles/accessbot/tasks/main.yaml +++ b/playbooks/roles/accessbot/tasks/main.yaml @@ -33,4 +33,4 @@ logrotate_file_name: /var/log/accessbot/accessbot.log - name: Pull latest image - command: docker pull quay.io/opendevorg/accessbot + command: docker pull docker.io/opendevorg/accessbot diff --git a/playbooks/roles/limnoria/files/docker-compose.yaml b/playbooks/roles/limnoria/files/docker-compose.yaml index e8d1cd9215..5635a4badd 100644 --- a/playbooks/roles/limnoria/files/docker-compose.yaml +++ b/playbooks/roles/limnoria/files/docker-compose.yaml @@ -4,7 +4,7 @@ version: '2' services: ircbot: - image: quay.io/opendevorg/ircbot:latest + image: docker.io/opendevorg/ircbot:latest network_mode: host restart: always logging: diff --git a/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml b/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml index 357a4f695e..d352e2e50e 100644 --- a/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml +++ b/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml @@ -4,7 +4,7 @@ version: '2' services: eavesdrop: - image: quay.io/opendevorg/matrix-eavesdrop:latest + image: docker.io/opendevorg/matrix-eavesdrop:latest network_mode: host restart: always logging: diff --git a/zuul.d/docker-images/accessbot.yaml b/zuul.d/docker-images/accessbot.yaml index 595c45ebc6..5a72cd8571 100644 --- a/zuul.d/docker-images/accessbot.yaml +++ b/zuul.d/docker-images/accessbot.yaml @@ -2,18 +2,13 @@ - job: name: system-config-build-image-accessbot description: Build a accessbot image. - parent: system-config-build-container-image + parent: system-config-build-image requires: python-base-3.11-bullseye-container-image provides: accessbot-container-image vars: &accessbot_vars - promote_container_image_job: system-config-upload-image-accessbot - container_images: + docker_images: - context: docker/accessbot - registry: quay.io - repository: quay.io/opendevorg/accessbot - namespace: opendevorg - repo_shortname: accessbot - repo_description: IRC acl management bot + repository: opendevorg/accessbot files: &accessbot_files - docker/accessbot/ - docker/python-base/ @@ -21,7 +16,7 @@ - job: name: system-config-upload-image-accessbot description: Build and upload a accessbot image. - parent: system-config-upload-container-image + parent: system-config-upload-image requires: python-base-3.11-bullseye-container-image provides: accessbot-container-image vars: *accessbot_vars @@ -30,6 +25,6 @@ - job: name: system-config-promote-image-accessbot description: Promote a previously published accessbot image to latest. - parent: system-config-promote-container-image + parent: system-config-promote-image vars: *accessbot_vars files: *accessbot_files diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml index 7e70e571c5..64ee4a0a96 100644 --- a/zuul.d/docker-images/eavesdrop.yaml +++ b/zuul.d/docker-images/eavesdrop.yaml @@ -2,27 +2,22 @@ - job: name: system-config-build-image-matrix-eavesdrop description: Build a matrix-eavesdrop image. - parent: system-config-build-container-image + parent: system-config-build-image requires: &matrix-eavesdrop_requires - python-base-3.9-bullseye-container-image - python-builder-3.9-bullseye-container-image provides: matrix-eavesdrop-container-image vars: &matrix-eavesdrop_vars - promote_container_image_job: system-config-upload-image-matrix-eavesdrop - container_images: + docker_images: - context: docker/matrix-eavesdrop - registry: quay.io - repository: quay.io/opendevorg/matrix-eavesdrop - namespace: opendevorg - repo_shortname: matrix-eavesdrop - repo_description: A matrix log collection bot. + repository: opendevorg/matrix-eavesdrop files: &matrix-eavesdrop_files - docker/matrix-eavesdrop/.* - job: name: system-config-upload-image-matrix-eavesdrop description: Build and upload a matrix-eavesdrop image. - parent: system-config-upload-container-image + parent: system-config-upload-image requires: *matrix-eavesdrop_requires provides: matrix-eavesdrop-container-image vars: *matrix-eavesdrop_vars @@ -31,6 +26,6 @@ - job: name: system-config-promote-image-matrix-eavesdrop description: Promote a previously published matrix-eavesdrop image to latest. - parent: system-config-promote-container-image + parent: system-config-promote-image vars: *matrix-eavesdrop_vars files: *matrix-eavesdrop_files diff --git a/zuul.d/docker-images/ircbot.yaml b/zuul.d/docker-images/ircbot.yaml index ed30a772bd..9a0a572189 100644 --- a/zuul.d/docker-images/ircbot.yaml +++ b/zuul.d/docker-images/ircbot.yaml @@ -2,7 +2,7 @@ - job: name: system-config-build-image-ircbot description: Build a ircbot image. - parent: system-config-build-container-image + parent: system-config-build-image requires: &ircbot_requires - python-base-3.9-bullseye-container-image - python-builder-3.9-bullseye-container-image @@ -10,15 +10,10 @@ required-projects: &ircbot_required_projects - opendev/meetbot vars: &ircbot_vars - promote_container_image_job: system-config-upload-image-ircbot - container_images: + docker_images: - context: docker/ircbot target: ircbot - registry: quay.io - repository: quay.io/opendevorg/ircbot - namespace: opendevorg - repo_shortname: ircbot - repo_description: A limnoria + meetbot IRC bot + repository: opendevorg/ircbot siblings: - opendev.org/opendev/meetbot files: &ircbot_files @@ -26,7 +21,7 @@ - job: name: system-config-upload-image-ircbot description: Build and upload a ircbot image. - parent: system-config-upload-container-image + parent: system-config-upload-image requires: *ircbot_requires provides: ircbot-container-image required-projects: *ircbot_required_projects @@ -36,6 +31,6 @@ - job: name: system-config-promote-image-ircbot description: Promote a previously published ircbot image to latest. - parent: system-config-promote-container-image + parent: system-config-promote-image vars: *ircbot_vars files: *ircbot_files