From 120cadf2f6a181899e1a9e81c8571edc29a98ece Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 9 Dec 2021 15:29:31 -0800 Subject: [PATCH] Update the registry docker image to bullseye This updates the base image to bullseye. Buster has a shelf life now and we should shift to bullseye. Change-Id: Ia136695f00a9ba71fc8ffe984e9563e1061ff099 --- .zuul.yaml | 6 ++++++ Dockerfile | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 5b28032..4e9c02a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -22,6 +22,9 @@ allowed-projects: zuul/zuul-registry run: playbooks/functional-test/run.yaml post-run: playbooks/functional-test/post.yaml + requires: + - python-builder-3.8-bullseye-container-image + - python-base-3.8-bullseye-container-image provides: zuul-registry-container-image nodeset: ubuntu-bionic vars: &image_vars @@ -46,6 +49,9 @@ name: docker_credentials secret: zuul-registry-dockerhub pass-to-parent: true + requires: + - python-builder-3.8-bullseye-container-image + - python-base-3.8-bullseye-container-image provides: zuul-registry-container-image vars: *image_vars diff --git a/Dockerfile b/Dockerfile index 70ef3ea..973f070 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this software. If not, see . -FROM opendevorg/python-builder:3.8 as builder +FROM opendevorg/python-builder:3.8-bullseye as builder COPY . /tmp/src RUN assemble -FROM opendevorg/python-base:3.8 as zuul-registry +FROM opendevorg/python-base:3.8-bullseye as zuul-registry COPY --from=builder /output/ /output RUN /output/install-from-bindep