From 88a6a202e9dc47ed8bd25a8a7ad25a3ceb01d590 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 15 Sep 2021 13:45:31 -0700 Subject: [PATCH] Build our gerrit images on Bullseye This is a bit of spring cleaning. Previously we based on images on Buster but Bullseye exists now so give it a go. Change-Id: Icc3d79b361e41df2f2f063993fd206ab7d992f75 --- docker/gerrit/base/Dockerfile | 4 ++-- zuul.d/docker-images/gerrit.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index f8159a060c..88ed68c08d 100644 --- a/docker/gerrit/base/Dockerfile +++ b/docker/gerrit/base/Dockerfile @@ -15,12 +15,12 @@ # Fri Aug 20 22:55:30 UTC 2021 - trigger rebuild -FROM docker.io/opendevorg/python-builder:3.7 as builder +FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder COPY . /tmp/src RUN assemble -FROM docker.io/library/openjdk:11 as gerrit-base +FROM docker.io/library/openjdk:11-bullseye as gerrit-base RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 9013171c79..894e83918e 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -6,7 +6,7 @@ required-projects: &gerrit_base_projects - opendev/jeepyb - opendev/system-config - requires: python-builder-3.7-buster-container-image + requires: python-builder-3.9-bullseye-container-image provides: gerrit-base-container-image pre-run: &gerrit-base_prerun - playbooks/zuul/gerrit/base.yaml @@ -24,7 +24,7 @@ name: system-config-upload-image-gerrit-base description: Build and upload a gerrit-base image. parent: system-config-upload-image - requires: python-builder-3.7-buster-container-image + requires: python-builder-3.9-bullseye-container-image provides: gerrit-base-container-image pre-run: *gerrit-base_prerun required-projects: *gerrit_base_projects