diff options
| author | Monty Taylor <mordred@inaugust.com> | 2020-03-12 11:52:49 -0500 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2020-03-12 14:17:53 -0500 |
| commit | 957cec37f37670fe76f8aca7c44ddfd349b83f2c (patch) | |
| tree | eb79cdb54a1fa7e2ae66a9f2d263205d05953c38 | |
| parent | d606ac51516dd8f28ec213f586859c9231eb7c55 (diff) | |
| download | zuul-957cec37f37670fe76f8aca7c44ddfd349b83f2c.tar.gz | |
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
| -rw-r--r-- | Dockerfile | 5 | ||||
| -rw-r--r-- | bindep.txt | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 225e3c9c9..78b68512b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/bindep.txt b/bindep.txt index a39a2ceb6..57352261d 100644 --- a/bindep.txt +++ b/bindep.txt @@ -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] |