From 31c3aa52b98b2c545ba38dc816fff15db262285d Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Tue, 11 Jul 2023 13:28:06 +1000 Subject: [PATCH] Update accessbot,ircboot and matrix-eavesdrop to bookworm container Change-Id: Idb096e21f57df3db1acc3d3afe3881e2e540f965 --- docker/accessbot/Dockerfile | 2 +- docker/ircbot/Dockerfile | 4 ++-- docker/matrix-eavesdrop/Dockerfile | 4 ++-- zuul.d/docker-images/accessbot.yaml | 4 ++-- zuul.d/docker-images/eavesdrop.yaml | 4 ++-- zuul.d/docker-images/ircbot.yaml | 4 ++-- zuul.d/project.yaml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/accessbot/Dockerfile b/docker/accessbot/Dockerfile index 5b7fb61bf7..298d6e262e 100644 --- a/docker/accessbot/Dockerfile +++ b/docker/accessbot/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-base:3.11-bullseye +FROM docker.io/opendevorg/python-base:3.11-bookworm RUN pip install pyyaml irc COPY accessbot.py /usr/local/bin/accessbot.py diff --git a/docker/ircbot/Dockerfile b/docker/ircbot/Dockerfile index 79389adda3..bb8a7a1e5a 100644 --- a/docker/ircbot/Dockerfile +++ b/docker/ircbot/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder +FROM docker.io/opendevorg/python-builder:3.9-bookworm as builder ARG ZUUL_SIBLINGS="" RUN apt-get update \ @@ -25,7 +25,7 @@ COPY . /tmp/src RUN assemble -FROM docker.io/opendevorg/python-base:3.9-bullseye as ircbot +FROM docker.io/opendevorg/python-base:3.9-bookworm as ircbot COPY --from=builder /output /output diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile index fc43e91806..fa8fa02d7f 100644 --- a/docker/matrix-eavesdrop/Dockerfile +++ b/docker/matrix-eavesdrop/Dockerfile @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder +FROM docker.io/opendevorg/python-builder:3.9-bookworm as builder COPY src /tmp/src RUN assemble -FROM docker.io/opendevorg/python-base:3.9-bullseye as eavesdrop +FROM docker.io/opendevorg/python-base:3.9-bookworm as eavesdrop COPY --from=builder /output/ /output RUN /output/install-from-bindep \ diff --git a/zuul.d/docker-images/accessbot.yaml b/zuul.d/docker-images/accessbot.yaml index 5a72cd8571..a58a3058eb 100644 --- a/zuul.d/docker-images/accessbot.yaml +++ b/zuul.d/docker-images/accessbot.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-accessbot description: Build a accessbot image. parent: system-config-build-image - requires: python-base-3.11-bullseye-container-image + requires: python-base-3.11-bookworm-container-image provides: accessbot-container-image vars: &accessbot_vars docker_images: @@ -17,7 +17,7 @@ name: system-config-upload-image-accessbot description: Build and upload a accessbot image. parent: system-config-upload-image - requires: python-base-3.11-bullseye-container-image + requires: python-base-3.11-bookworm-container-image provides: accessbot-container-image vars: *accessbot_vars files: *accessbot_files diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml index 64ee4a0a96..25e8cec390 100644 --- a/zuul.d/docker-images/eavesdrop.yaml +++ b/zuul.d/docker-images/eavesdrop.yaml @@ -4,8 +4,8 @@ description: Build a matrix-eavesdrop image. parent: system-config-build-image requires: &matrix-eavesdrop_requires - - python-base-3.9-bullseye-container-image - - python-builder-3.9-bullseye-container-image + - python-base-3.9-bookworm-container-image + - python-builder-3.9-bookworm-container-image provides: matrix-eavesdrop-container-image vars: &matrix-eavesdrop_vars docker_images: diff --git a/zuul.d/docker-images/ircbot.yaml b/zuul.d/docker-images/ircbot.yaml index 9a0a572189..a8b9fe329b 100644 --- a/zuul.d/docker-images/ircbot.yaml +++ b/zuul.d/docker-images/ircbot.yaml @@ -4,8 +4,8 @@ description: Build a ircbot image. parent: system-config-build-image requires: &ircbot_requires - - python-base-3.9-bullseye-container-image - - python-builder-3.9-bullseye-container-image + - python-base-3.9-bookworm-container-image + - python-builder-3.9-bookworm-container-image provides: ircbot-container-image required-projects: &ircbot_required_projects - opendev/meetbot diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index ede9cbfcb2..e094f6701a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -137,7 +137,7 @@ - system-config-build-image-accessbot: 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-ircbot: dependencies: @@ -296,7 +296,7 @@ - system-config-upload-image-accessbot: 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-ircbot: dependencies: