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:
parent
d606ac5151
commit
957cec37f3
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in New Issue