From 17ba858b19241f2511c347e48f2138094cdba59c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 15 Sep 2021 10:49:42 -0700 Subject: [PATCH] Update our gitea images to bullseye To do this we also update jinja-init to bullseye and gitea seems to be the only user of this image. The impact of this should be fairly self contained to gitea. Note this update isn't urgent, but good hygiene. We should coordinate this update with the 1.15.x gitea upgrade and do them in such a sequence that we can identify problems easily if they pop up. Change-Id: Ia0075416a1d8a067cfecd26c03f8db9641cbcb89 --- docker/gitea/Dockerfile | 11 ++++------- docker/jinja-init/Dockerfile | 2 +- zuul.d/docker-images/jinja-init.yaml | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index 9833b72b32..c3017b8b75 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -23,7 +23,7 @@ ################################### #Build stage -FROM docker.io/library/golang:1.16-buster AS build-env +FROM docker.io/library/golang:1.16-bullseye AS build-env LABEL maintainer="infra-root@openstack.org" @@ -33,7 +33,7 @@ ENV TAGS "bindata $TAGS" #Build deps RUN apt-get update && apt-get -y install build-essential git apt-transport-https curl gnupg2 \ && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_14.x buster main" | tee /etc/apt/sources.list.d/nodesource.list \ + && echo "deb https://deb.nodesource.com/node_14.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs \ && mkdir -p ${GOPATH}/src/code.gitea.io/gitea @@ -49,7 +49,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ ################################### # Basic system setup common to all containers in our pod -FROM docker.io/library/debian:buster-slim as base +FROM docker.io/library/debian:bullseye-slim as base RUN apt-get update && apt-get -y install \ bash \ @@ -106,12 +106,9 @@ USER 1000:1000 # The openssh server image FROM base as gitea-openssh -# We enable backports here to install newer openssh which includes -# support for options that gitea's ssh configuration expects -RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confold" \ - -t buster-backports install openssh-server \ + install openssh-server \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && mkdir /run/sshd diff --git a/docker/jinja-init/Dockerfile b/docker/jinja-init/Dockerfile index 0397c7ac3a..ed5e0749bf 100644 --- a/docker/jinja-init/Dockerfile +++ b/docker/jinja-init/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -FROM docker.io/opendevorg/python-base:3.7 as build +FROM docker.io/opendevorg/python-base:3.9-bullseye as build RUN apt-get update && apt-get -y install \ git \ diff --git a/zuul.d/docker-images/jinja-init.yaml b/zuul.d/docker-images/jinja-init.yaml index c012d298b8..614d11a8ef 100644 --- a/zuul.d/docker-images/jinja-init.yaml +++ b/zuul.d/docker-images/jinja-init.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-jinja-init description: Build a jinja-init image. parent: system-config-build-image - requires: python-base-3.7-buster-container-image + requires: python-base-3.9-bullseye-container-image provides: jinja-init-container-image vars: &jinja-init_vars docker_images: @@ -18,7 +18,7 @@ name: system-config-upload-image-jinja-init description: Build and upload a jinja-init image. parent: system-config-upload-image - requires: python-base-3.7-buster-container-image + requires: python-base-3.9-bullseye-container-image provides: jinja-init-container-image vars: *jinja-init_vars files: *jinja-init_files