opendev
/
system-config
Code Issues Proposed changes

Properly build bullseye uwsgi-base docker images 

We were clearly intending on building bullseye uwsgi-base images as we
have jobs that tag bullseye images properly. Unfortunately those images
are actually buster images because we didn't set the DEBIAN_VERSION var
in our Dockerfile that is passed in from the job side.

Fix this by setting the debian version appropriately.

Note this has the potential for breaking people who think they are
running bullseye images but are actually running buster when this lands
as it will update them to bullseye finally. This seems worthwhile since
it is what they requested afterall. Known consumers of this image are
opendev's lodgeit image and vexxhost. Speaking for opendev and lodgeit I
think this fine and we'll roll forward as necessary but we should cross
check with vexxhost on this.

Note: THe pip verbosity update was initially made to debug build
failures that are hard to reproduce locally. The more verbose logs end
up making things work more reliably so we'll just use them here I guess.

Change-Id: Ie774bf12699a8e28dcab636094373687480fcecf
This commit is contained in:
Clark Boylan 2021-12-09 15:43:59 -08:00
parent 0645a481d0
commit d895bb0c35
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docker/uwsgi-base/Dockerfile
View File

@ -14,12 +14,27 @@
# limitations under the License.
ARG PYTHON_VERSION=3.7
FROM docker.io/opendevorg/python-builder:${PYTHON_VERSION} as builder
ARG DEBIAN_VERSION=buster
FROM docker.io/opendevorg/python-builder:${PYTHON_VERSION}-${DEBIAN_VERSION} as builder
ARG PYTHON_VERSION
COPY . /tmp/src
RUN assemble uWSGI
# We set pip verbosity because this seems to make the uWSGI wheel builds
# more reliable on bullseye. Is it crazy to rely on this? Absolutely. But
# uWSGI's build system is a ball of fun. There is an upstream pull request
# that appears to be fixing this issue:
# https://github.com/unbit/uwsgi/pull/2362
# jrosser also indicates this can be fixed by not overriding function names:
# https://paste.opendev.org/show/811669/
# Until a fix lands use this verbosity flag to work around it.
#
# Older python bundles older pip and doesn't understand non binary
# verbosity values. We explicitly invoke bash here to get access to [[
# in order to check the version against a pattern. test doesn't cut it.
RUN /bin/bash -c "if [[ $PYTHON_VERSION == 3.7* ]] ; then exit 0 ; else exit 1 ; fi" && PIP_VERBOSE=1 assemble uWSGI || PIP_VERBOSE=3 assemble uWSGI
FROM docker.io/opendevorg/python-base:${PYTHON_VERSION}
FROM docker.io/opendevorg/python-base:${PYTHON_VERSION}-${DEBIAN_VERSION}
COPY --from=builder /output/ /output
RUN /output/install-from-bindep && \

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

@ -1,5 +1,6 @@
gcc [compile]
libc6-dev [compile]
libffi-dev [compile platform:dpkg]
libffi6 [platform:dpkg]
libffi7 [platform:dpkg !platform:ubuntu-bionic !platform:debian-buster]
libffi6 [platform:ubuntu-bionic platform:debian-buster]
libssl-dev [compile platform:dpkg]