From df729ff225a87794e897872629a2e6e31574127d Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 26 Aug 2025 15:11:17 -0700 Subject: [PATCH] Pull python base image for statsd metric reporters from quay.io The parent change moves the publication of these images to quay.io. Build the haproxy and zookeeper statsd sidecar images with the images hosted on quay.io to match. We switch to building with docker now that docker is capable of building with speculative images in single arch builds. Change-Id: I8f444c01cd46099df93250994286aab0633b856d --- docker/haproxy-statsd/Dockerfile | 2 +- docker/zookeeper-statsd/Dockerfile | 2 +- zuul.d/docker-images/haproxy.yaml | 1 + zuul.d/docker-images/zookeeper-statsd.yaml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/haproxy-statsd/Dockerfile b/docker/haproxy-statsd/Dockerfile index 7c24a9e61a..8912709cf7 100644 --- a/docker/haproxy-statsd/Dockerfile +++ b/docker/haproxy-statsd/Dockerfile @@ -15,7 +15,7 @@ # Thu Aug 7 07:33:54 PM UTC 2025 - trigger rebuild -FROM docker.io/opendevorg/python-base:3.12-bookworm +FROM quay.io/opendevorg/python-base:3.12-bookworm COPY haproxy-statsd.py /usr/local/bin RUN pip install statsd diff --git a/docker/zookeeper-statsd/Dockerfile b/docker/zookeeper-statsd/Dockerfile index 76c636dce6..28c13e7086 100644 --- a/docker/zookeeper-statsd/Dockerfile +++ b/docker/zookeeper-statsd/Dockerfile @@ -16,7 +16,7 @@ # Thu Aug 7 07:33:54 PM UTC 2025 - trigger rebuild -FROM docker.io/opendevorg/python-base:3.12-bookworm +FROM quay.io/opendevorg/python-base:3.12-bookworm COPY zookeeper-statsd.py /usr/local/bin RUN pip install statsd diff --git a/zuul.d/docker-images/haproxy.yaml b/zuul.d/docker-images/haproxy.yaml index 9051d2187a..3cdc7e552f 100644 --- a/zuul.d/docker-images/haproxy.yaml +++ b/zuul.d/docker-images/haproxy.yaml @@ -7,6 +7,7 @@ provides: haproxy-statsd-container-image vars: &haproxy-statsd_vars promote_container_image_job: system-config-upload-image-haproxy-statsd + container_command: docker container_images: - context: docker/haproxy-statsd registry: quay.io diff --git a/zuul.d/docker-images/zookeeper-statsd.yaml b/zuul.d/docker-images/zookeeper-statsd.yaml index 5cc7a6b676..c2cf950353 100644 --- a/zuul.d/docker-images/zookeeper-statsd.yaml +++ b/zuul.d/docker-images/zookeeper-statsd.yaml @@ -6,6 +6,7 @@ requires: python-base-3.12-bookworm-container-image vars: &zookeeper-statsd_vars promote_container_image_job: system-config-upload-image-zookeeper-statsd + container_command: docker container_images: - context: docker/zookeeper-statsd registry: quay.io