zuul
/
zuul
Code Issues Proposed changes

Build Zuul's docker images on Bullseye 

Bullseye is out and Buster is old news :) Bump up the base image that we
build Zuul on to Bullseye from Buster. The python version remains the
same but this gives us a more up to date userland. In particular git
goes from 2.20 to 2.30.

Change-Id: I2decbe805a4d0d1daa96de24e317339cee318850
This commit is contained in:
Clark Boylan 2021-10-12 15:27:44 -07:00
parent a32753227b
commit 4ebbcbdc27
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -13,13 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM docker.io/library/node:14-buster as js-builder
FROM docker.io/library/node:14-bullseye as js-builder
COPY web /tmp/src
# Explicitly run the Javascript build
RUN cd /tmp/src && yarn install -d && yarn build
FROM docker.io/opendevorg/python-builder:3.8 as builder
FROM docker.io/opendevorg/python-builder:3.8-bullseye as builder
ENV DEBIAN_FRONTEND=noninteractive
# Optional location of Zuul API endpoint.
@ -48,7 +48,7 @@ RUN /output/install-from-bindep \
&& echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
&& tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install
FROM docker.io/opendevorg/python-base:3.8 as zuul
FROM docker.io/opendevorg/python-base:3.8-bullseye as zuul
ENV DEBIAN_FRONTEND=noninteractive
COPY --from=builder /output/ /output
@ -71,7 +71,7 @@ COPY --from=builder /tmp/openshift-install/oc /usr/local/bin/oc
# https://podman.io/getting-started/installation.html
COPY tools/4D64390375060AA4.asc /etc/apt/trusted.gpg.d/kubic.asc
RUN echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list \
RUN echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_11/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list \
&& apt-get update \
&& apt-get install -y skopeo \
&& apt-get clean \