From 22957c654935c6e12fe00f434a77a9ac27396aa1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 9 Dec 2021 15:04:43 -0800 Subject: [PATCH] Update limboria ircbot to bullseye Spring cleaning updates of our docker images now that bullseye is out. Change-Id: I5e4b84edd2c5a8e196659e4815c5b349c0226393 --- docker/ircbot/Dockerfile | 4 ++-- zuul.d/docker-images/ircbot.yaml | 4 ++-- zuul.d/project.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/ircbot/Dockerfile b/docker/ircbot/Dockerfile index bb20d2e311..a4cb1438da 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 opendevorg/python-builder:3.9 as builder +FROM opendevorg/python-builder:3.9-bullseye as builder ARG ZUUL_SIBLINGS="" RUN apt-get update \ @@ -29,7 +29,7 @@ COPY . /tmp/src RUN assemble -FROM opendevorg/python-base:3.9 as ircbot +FROM opendevorg/python-base:3.9-bullseye as ircbot COPY --from=builder /output /output diff --git a/zuul.d/docker-images/ircbot.yaml b/zuul.d/docker-images/ircbot.yaml index 619597361c..9a0a572189 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-buster-container-image - - python-builder-3.9-buster-container-image + - python-base-3.9-bullseye-container-image + - python-builder-3.9-bullseye-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 0894e181f4..16fc5ebc97 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -138,7 +138,7 @@ - system-config-build-image-ircbot: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.9-buster + - name: system-config-build-image-python-builder-3.9-bullseye soft: true - system-config-build-image-matrix-eavesdrop: dependencies: @@ -288,7 +288,7 @@ - system-config-upload-image-ircbot: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-builder-3.9-buster + - name: system-config-upload-image-python-builder-3.9-bullseye soft: true - system-config-upload-image-matrix-eavesdrop: dependencies: