From 3b2016039ca2a6a5cf3b9d65933ac6d1d1b96b27 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Tue, 11 Jul 2023 15:34:49 +1000 Subject: [PATCH] Update ircbot and matrix-eavesdrop to python-3.11 Change-Id: I813f62d06212b09638baa7ef0be0de1ad9ff7d83 --- docker/ircbot/Dockerfile | 4 ++-- docker/matrix-eavesdrop/Dockerfile | 4 ++-- zuul.d/docker-images/eavesdrop.yaml | 4 ++-- zuul.d/docker-images/ircbot.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/ircbot/Dockerfile b/docker/ircbot/Dockerfile index 79b89fdb61..9dec8f5750 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-bookworm as builder +FROM docker.io/opendevorg/python-builder:3.11-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-bookworm as ircbot +FROM docker.io/opendevorg/python-base:3.11-bookworm as ircbot COPY --from=builder /output /output diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile index fa8fa02d7f..1afe3f3ac3 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-bookworm as builder +FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder COPY src /tmp/src RUN assemble -FROM docker.io/opendevorg/python-base:3.9-bookworm as eavesdrop +FROM docker.io/opendevorg/python-base:3.11-bookworm as eavesdrop COPY --from=builder /output/ /output RUN /output/install-from-bindep \ diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml index 25e8cec390..f23d881cf4 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-bookworm-container-image - - python-builder-3.9-bookworm-container-image + - python-base-3.11-bookworm-container-image + - python-builder-3.11-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 a8b9fe329b..49a061ba2c 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-bookworm-container-image - - python-builder-3.9-bookworm-container-image + - python-base-3.11-bookworm-container-image + - python-builder-3.11-bookworm-container-image provides: ircbot-container-image required-projects: &ircbot_required_projects - opendev/meetbot