From b3bd66c1dd07136be252b33a84cadaaa4a5d8c88 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 11 Apr 2025 08:06:28 -0700 Subject: [PATCH] Publish hound container images to quay Now that codesearch is deployed on Noble with podman as the container runtime we can push our hound container to quay and still have speculative container images. Do this to reduce our reliance on docker hub as their rate limits are very aggressive now. Change-Id: I364da9ebe10e681de024b50cbdccdb5b3fce3617 --- docker/hound/Dockerfile | 2 ++ .../codesearch/templates/docker-compose.yaml.j2 | 2 +- zuul.d/docker-images/hound.yaml | 15 ++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docker/hound/Dockerfile b/docker/hound/Dockerfile index 7bbdb76007..195a43a730 100644 --- a/docker/hound/Dockerfile +++ b/docker/hound/Dockerfile @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Trigger rebuild - Fri Apr 11 03:16:46 PM UTC 2025 + FROM docker.io/library/golang:1.19-bookworm AS builder WORKDIR /tmp diff --git a/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 b/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 index 03543d9598..e4a5709e99 100644 --- a/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 @@ -1,7 +1,7 @@ services: hound: restart: always - image: docker.io/opendevorg/hound + image: quay.io/opendevorg/hound network_mode: host environment: - 'USE_HOUND_TEST_CONFIG={{ "1" if codesearch_use_test_config else "0" }}' diff --git a/zuul.d/docker-images/hound.yaml b/zuul.d/docker-images/hound.yaml index cd9996e3a0..426250d17f 100644 --- a/zuul.d/docker-images/hound.yaml +++ b/zuul.d/docker-images/hound.yaml @@ -4,11 +4,16 @@ description: Build a hound image. requires: python-base-3.12-bookworm-container-image provides: hound-container-image - parent: system-config-build-image + parent: system-config-build-container-image vars: &hound_vars - docker_images: + promote_container_image_job: system-config-upload-image-hound + container_images: - context: docker/hound - repository: opendevorg/hound + registry: quay.io + repository: quay.io/opendevorg/hound + namespace: opendevorg + repo_shortname: hound + repo_description: Hound Codesearch Tool files: &hound_files - docker/hound/ @@ -17,13 +22,13 @@ description: Build and upload a hound image. requires: python-base-3.12-bookworm-container-image provides: hound-container-image - parent: system-config-upload-image + parent: system-config-upload-container-image vars: *hound_vars files: *hound_files - job: name: system-config-promote-image-hound description: Promote a previously published hound image to latest. - parent: system-config-promote-image + parent: system-config-promote-container-image vars: *hound_vars files: *hound_files