From 6ada97cc6fc34a45592446be073d95dd953d328e Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 26 Apr 2023 10:40:30 -0700 Subject: [PATCH] Switch zuul container images to quay.io Zuul is moving its container image hosting to quay.io. Update our docker-compose.yaml files to pull the images from this new location. Note we don't update zuul-registry as it hasn't updated yet. A followup change will update that container image location separately. Change-Id: Idce7df82e811490fa5d817682479161bd74cd848 --- playbooks/roles/zuul-executor/files/docker-compose.yaml | 2 +- playbooks/roles/zuul-merger/files/docker-compose.yaml | 2 +- .../files/zuul-preview-docker/docker-compose.yaml | 2 +- playbooks/roles/zuul-scheduler/files/docker-compose.yaml | 2 +- playbooks/roles/zuul-web/files/docker-compose.yaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/roles/zuul-executor/files/docker-compose.yaml b/playbooks/roles/zuul-executor/files/docker-compose.yaml index 6462df7b7a..9ddd2a810d 100644 --- a/playbooks/roles/zuul-executor/files/docker-compose.yaml +++ b/playbooks/roles/zuul-executor/files/docker-compose.yaml @@ -5,7 +5,7 @@ version: '2' services: executor: restart: on-failure - image: docker.io/zuul/zuul-executor:latest + image: quay.io/zuul-ci/zuul-executor:latest network_mode: host user: zuul privileged: true diff --git a/playbooks/roles/zuul-merger/files/docker-compose.yaml b/playbooks/roles/zuul-merger/files/docker-compose.yaml index ee665e54ab..72a6db8f92 100644 --- a/playbooks/roles/zuul-merger/files/docker-compose.yaml +++ b/playbooks/roles/zuul-merger/files/docker-compose.yaml @@ -5,7 +5,7 @@ version: '2' services: merger: restart: on-failure - image: docker.io/zuul/zuul-merger:latest + image: quay.io/zuul-ci/zuul-merger:latest network_mode: host user: zuul volumes: diff --git a/playbooks/roles/zuul-preview/files/zuul-preview-docker/docker-compose.yaml b/playbooks/roles/zuul-preview/files/zuul-preview-docker/docker-compose.yaml index 651d04259c..a4b673f7c0 100644 --- a/playbooks/roles/zuul-preview/files/zuul-preview-docker/docker-compose.yaml +++ b/playbooks/roles/zuul-preview/files/zuul-preview-docker/docker-compose.yaml @@ -5,7 +5,7 @@ version: '2' services: zuul-preview: restart: always - image: docker.io/zuul/zuul-preview:latest + image: quay.io/zuul-ci/zuul-preview:latest network_mode: host environment: ZUUL_API_URL: https://zuul.opendev.org/ diff --git a/playbooks/roles/zuul-scheduler/files/docker-compose.yaml b/playbooks/roles/zuul-scheduler/files/docker-compose.yaml index 6659d61274..eb68e8293b 100644 --- a/playbooks/roles/zuul-scheduler/files/docker-compose.yaml +++ b/playbooks/roles/zuul-scheduler/files/docker-compose.yaml @@ -5,7 +5,7 @@ version: '2' services: scheduler: restart: always - image: docker.io/zuul/zuul-scheduler:latest + image: quay.io/zuul-ci/zuul-scheduler:latest network_mode: host user: zuul volumes: diff --git a/playbooks/roles/zuul-web/files/docker-compose.yaml b/playbooks/roles/zuul-web/files/docker-compose.yaml index d43a40415f..d937bc3c4a 100644 --- a/playbooks/roles/zuul-web/files/docker-compose.yaml +++ b/playbooks/roles/zuul-web/files/docker-compose.yaml @@ -5,7 +5,7 @@ version: '2' services: web: restart: always - image: docker.io/zuul/zuul-web:latest + image: quay.io/zuul-ci/zuul-web:latest network_mode: host user: zuul volumes: @@ -15,7 +15,7 @@ services: - /var/log/zuul:/var/log/zuul fingergw: restart: always - image: docker.io/zuul/zuul-fingergw:latest + image: quay.io/zuul-ci/zuul-fingergw:latest network_mode: host # fingergw needs to run as root so it can # grab the finger port and then drop privs