From 4884d3b858e81247ab7c5b23ce0e65d4bc64cb18 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 19 Oct 2022 14:23:42 -0700 Subject: [PATCH] Cleanup uwsgi build hacks The recent uwsgi 2.0.21 release claims to have fixed issues building uwsgi that required us to increase pip verbosity and reduce concurrency. Remove those hacky workarounds in order to simplify our image. Change-Id: I8b81bc3a5e6977ba8cd296708f356bc6db030fc2 --- docker/uwsgi-base/Dockerfile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/docker/uwsgi-base/Dockerfile b/docker/uwsgi-base/Dockerfile index 5f7853ddbe..74f4ebc64e 100644 --- a/docker/uwsgi-base/Dockerfile +++ b/docker/uwsgi-base/Dockerfile @@ -20,19 +20,7 @@ FROM docker.io/opendevorg/python-builder:${PYTHON_VERSION}-${DEBIAN_VERSION} as ARG PYTHON_VERSION COPY . /tmp/src -# 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 +RUN assemble uWSGI FROM docker.io/opendevorg/python-base:${PYTHON_VERSION}-${DEBIAN_VERSION}