zuul
/
zuul
Code Issues Proposed changes

Remove stretch-backports from docker build 

python-base is buster now, so this is not necessary. We can
just install bubblewrap and socat from buster directly.

Change-Id: If65f3c2d6367a7c79cf9d6d8f788021ba72cccd4
This commit is contained in:
Monty Taylor 2020-03-12 11:52:49 -05:00
parent d606ac5151
commit 957cec37f3
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -42,11 +42,6 @@ RUN mkdir /tmp/openshift-install \
FROM docker.io/opendevorg/python-base as zuul
COPY --from=builder /output/ /output
RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list \
&& apt-get update \
&& apt-get install -t stretch-backports -y bubblewrap socat \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN /output/install-from-bindep \
&& pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \
&& rm -rf /output

1
bindep.txt
View File

@ -35,6 +35,7 @@ python3-devel [compile test platform:rpm]
python3.7 [test platform:ubuntu-bionic]
python3.7-dev [test platform:ubuntu-bionic]
bubblewrap [!platform:ubuntu-xenial]
socat
libre2-dev [compile test platform:dpkg]
libre2-5 [platform:debian-buster]
libre2-4 [platform:ubuntu-bionic]