opendev
/
system-config
Code Issues Proposed changes

Pin base and builder images to buster 

There's some more work before our consumers can switch to bullseye.
To make this process more tractable, revert the recent backport
addition, and specify that we want bullseye images from upstream.

That gets us back to where we were at the start of this.  Next,
we can start building 2x images of python-base/builder and tag
them with bullseye or buster.  Then the consumers can specify
which tags, then start switching.

Revert "Add backports repos to base and builder images"

This reverts commit b217e38904.

Revert "Update matrix-eavesdrop for bullseye"

This reverts commit fc38c69753.

Change-Id: Id21681342fe5268296128c1b09436a80c46e3169
This commit is contained in:
James E. Blair 2021-08-27 07:59:44 -07:00
parent 84dca1ecf4
commit 45caec4d43
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/matrix-eavesdrop/Dockerfile
View File

@ -14,11 +14,13 @@
# limitations under the License.
FROM docker.io/opendevorg/python-builder:3.9 as builder
RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
COPY src /tmp/src
RUN assemble
FROM docker.io/opendevorg/python-base:3.9 as eavesdrop
RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
COPY --from=builder /output/ /output
RUN /output/install-from-bindep \

4
docker/matrix-eavesdrop/src/bindep.txt
View File

@ -1,7 +1,7 @@
gcc [compile test]
libc6-dev [compile test]
libffi-dev [compile test]
libolm-dev [compile test]
libolm-dev/buster-backports [compile test]
make [compile test]
python3-dev [compile test]
libolm3
libolm3/buster-backports

5
docker/python-base/Dockerfile
View File

@ -16,15 +16,14 @@
# Comment to force rebuilds Tue Aug 3 19:59:32 UTC 2021
ARG PYTHON_VERSION=3.7
FROM docker.io/library/python:${PYTHON_VERSION}-slim
FROM docker.io/library/python:${PYTHON_VERSION}-slim-buster
RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends
RUN apt-get update \
&& apt-get install -y dumb-init \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list
&& rm -rf /var/lib/apt/lists/*
# Upgrade pip to fix wheel cache for locally built wheels.
# See https://github.com/pypa/pip/issues/6852

7
docker/python-builder/Dockerfile
View File

@ -16,7 +16,7 @@
# Comment to force rebuilds Tue Aug 3 19:59:32 UTC 2021
ARG PYTHON_VERSION=3.7
FROM docker.io/library/python:${PYTHON_VERSION}-slim as fake-python
FROM docker.io/library/python:${PYTHON_VERSION}-slim-buster as fake-python
WORKDIR /tmp
RUN apt-get update \
@ -25,7 +25,7 @@ RUN apt-get update \
COPY python3-dev.control /tmp/python3-dev.control
RUN equivs-build /tmp/python3-dev.control
FROM docker.io/library/python:${PYTHON_VERSION}-slim
FROM docker.io/library/python:${PYTHON_VERSION}-slim-buster
RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends
@ -36,8 +36,7 @@ COPY scripts/install-from-bindep /output/install-from-bindep
RUN dpkg -i /tmp/python3-dev_4.0.0_all.deb \
&& rm /tmp/python3-dev_4.0.0_all.deb \
&& pip install --no-cache-dir bindep \
&& rm -rf /var/lib/apt/lists/* \
&& echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list
&& rm -rf /var/lib/apt/lists/*
# Upgrade pip to fix wheel cache for locally built wheels
# See https://github.com/pypa/pip/issues/6852

2
docker/uwsgi-base/bindep.txt
View File

@ -1,5 +1,5 @@
gcc [compile]
libc6-dev [compile]
libffi-dev [compile platform:dpkg]
libffi7 [platform:dpkg]
libffi6 [platform:dpkg]
libssl-dev [compile platform:dpkg]