diff --git a/docker/haproxy-statsd/Dockerfile b/docker/haproxy-statsd/Dockerfile index 8912709cf7..29b0fff5c1 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 quay.io/opendevorg/python-base:3.12-bookworm +FROM quay.io/opendevorg/python-base:3.12-trixie COPY haproxy-statsd.py /usr/local/bin RUN pip install statsd diff --git a/docker/zookeeper-statsd/Dockerfile b/docker/zookeeper-statsd/Dockerfile index 28c13e7086..70bf787eba 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 quay.io/opendevorg/python-base:3.12-bookworm +FROM quay.io/opendevorg/python-base:3.12-trixie 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 3cdc7e552f..182a429ce5 100644 --- a/zuul.d/docker-images/haproxy.yaml +++ b/zuul.d/docker-images/haproxy.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-haproxy-statsd description: Build a haproxy-statsd image. parent: system-config-build-container-image - requires: python-base-3.12-bookworm-container-image + requires: python-base-3.12-trixie-container-image provides: haproxy-statsd-container-image vars: &haproxy-statsd_vars promote_container_image_job: system-config-upload-image-haproxy-statsd @@ -24,7 +24,7 @@ name: system-config-upload-image-haproxy-statsd description: Build and upload a haproxy-statsd image. parent: system-config-upload-container-image - requires: python-base-3.12-bookworm-container-image + requires: python-base-3.12-trixie-container-image provides: haproxy-statsd-container-image vars: *haproxy-statsd_vars files: *haproxy-statsd_files diff --git a/zuul.d/docker-images/zookeeper-statsd.yaml b/zuul.d/docker-images/zookeeper-statsd.yaml index c2cf950353..2de33029dc 100644 --- a/zuul.d/docker-images/zookeeper-statsd.yaml +++ b/zuul.d/docker-images/zookeeper-statsd.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-zookeeper-statsd description: Build a zookeeper-statsd image. parent: system-config-build-container-image - requires: python-base-3.12-bookworm-container-image + requires: python-base-3.12-trixie-container-image vars: &zookeeper-statsd_vars promote_container_image_job: system-config-upload-image-zookeeper-statsd container_command: docker @@ -22,7 +22,7 @@ name: system-config-upload-image-zookeeper-statsd description: Build and upload a zookeeper-statsd image. parent: system-config-upload-container-image - requires: python-base-3.12-bookworm-container-image + requires: python-base-3.12-trixie-container-image vars: *zookeeper-statsd_vars files: *zookeeper-statsd_files diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 457ca16764..7e4281cae1 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -108,12 +108,12 @@ - system-config-build-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.12-bookworm + - name: system-config-build-image-python-base-3.12-trixie soft: true - system-config-build-image-zookeeper-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.12-bookworm + - name: system-config-build-image-python-base-3.12-trixie soft: true - system-config-build-image-accessbot: dependencies: @@ -251,12 +251,12 @@ - system-config-upload-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.12-bookworm + - name: system-config-upload-image-python-base-3.12-trixie soft: true - system-config-upload-image-zookeeper-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.12-bookworm + - name: system-config-upload-image-python-base-3.12-trixie soft: true - system-config-upload-image-accessbot: dependencies: