From 2888408833da3c1afe65e1d4cabc26289893b953 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 14 Sep 2023 13:36:18 -0700 Subject: [PATCH] Convert haproxy-statsd to bookworm base image We keep the same python 3.11 version we had on bullseye but switch the rest of the userspace to bookworm. Since the python version doesn't change this should have minimal impact. Change-Id: I59ad8c2a92159f51d567dd0212e2ab8bec1b45b1 --- docker/haproxy-statsd/Dockerfile | 2 +- zuul.d/docker-images/haproxy.yaml | 4 ++-- zuul.d/project.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/haproxy-statsd/Dockerfile b/docker/haproxy-statsd/Dockerfile index 43165a3b3b..31e8ec2cfd 100644 --- a/docker/haproxy-statsd/Dockerfile +++ b/docker/haproxy-statsd/Dockerfile @@ -15,7 +15,7 @@ # Wed May 24 18:38:17 UTC 2023 - trigger rebuild -FROM docker.io/opendevorg/python-base:3.11-bullseye +FROM docker.io/opendevorg/python-base:3.11-bookworm COPY haproxy-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 9fa863afae..388943ffbd 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-image - requires: python-base-3.11-bullseye-container-image + requires: python-base-3.11-bookworm-container-image provides: haproxy-statsd-container-image vars: &haproxy-statsd_vars docker_images: @@ -18,7 +18,7 @@ name: system-config-upload-image-haproxy-statsd description: Build and upload a haproxy-statsd image. parent: system-config-upload-image - requires: python-base-3.11-bullseye-container-image + requires: python-base-3.11-bookworm-container-image provides: haproxy-statsd-container-image vars: *haproxy-statsd_vars files: *haproxy-statsd_files diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e094f6701a..26318a5b85 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -127,7 +127,7 @@ - system-config-build-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.11-bullseye + - name: system-config-build-image-python-base-3.11-bookworm soft: true - system-config-build-image-zookeeper-statsd: dependencies: @@ -286,7 +286,7 @@ - system-config-upload-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.11-bullseye + - name: system-config-upload-image-python-base-3.11-bookworm soft: true - system-config-upload-image-zookeeper-statsd: dependencies: