From 3a997a56312a0a3deec6066a3f96cd8012040565 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Wed, 6 May 2020 02:10:51 +0200 Subject: [PATCH] Install pipstrap to pin setuptools/pip/wheels, since setuptools and pip continues to play with us. (#23) So, setuptools broke the installation setup, by removing a deprecated API that is still used by some of our dependencies (see pypa/setuptools#2017) This PR fixes the Docker build by using pipstrap to pin pip/setuptools/wheels, like it is done in several critical places (certbot-auto, ...). An issue in certbot is opened to fix more generally the problem in most recent versions of setuptools: certbot/certbot#7976 It rebuilt locally all dockers (certbot + dns plugins) for the three architectures, and all have passed. --- tools/docker/core/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/docker/core/Dockerfile b/tools/docker/core/Dockerfile index 16fbbfd01..2afd148e7 100644 --- a/tools/docker/core/Dockerfile +++ b/tools/docker/core/Dockerfile @@ -21,6 +21,7 @@ RUN mkdir -p src \ && tar xf certbot-${CERTBOT_VERSION}.tar.gz \ && cp certbot-${CERTBOT_VERSION}/CHANGELOG.md certbot-${CERTBOT_VERSION}/README.rst src/ \ && cp certbot-${CERTBOT_VERSION}/letsencrypt-auto-source/pieces/dependency-requirements.txt . \ + && cp certbot-${CERTBOT_VERSION}/letsencrypt-auto-source/pieces/pipstrap.py . \ && cp -r certbot-${CERTBOT_VERSION}/tools tools \ && cp -r certbot-${CERTBOT_VERSION}/acme src/acme \ && cp -r certbot-${CERTBOT_VERSION}/certbot src/certbot \ @@ -45,6 +46,7 @@ RUN apk add --no-cache --virtual .build-deps \ openssl-dev \ musl-dev \ libffi-dev \ + && python pipstrap.py \ && pip install -r dependency-requirements.txt \ && pip install --no-cache-dir --no-deps \ --editable src/acme \