From b020f94a01429287b2567d1ba3e2ddffd12c493c Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 28 Nov 2017 15:25:01 -0800 Subject: [PATCH] Use pipstrap to install a good version of pip --- letsencrypt-auto-source/Dockerfile.centos6 | 3 +++ letsencrypt-auto-source/Dockerfile.precise | 4 +++- letsencrypt-auto-source/Dockerfile.trusty | 3 +++ letsencrypt-auto-source/Dockerfile.wheezy | 5 +++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/letsencrypt-auto-source/Dockerfile.centos6 b/letsencrypt-auto-source/Dockerfile.centos6 index e1280109b..a941ede1f 100644 --- a/letsencrypt-auto-source/Dockerfile.centos6 +++ b/letsencrypt-auto-source/Dockerfile.centos6 @@ -7,6 +7,9 @@ RUN yum install -y epel-release # Install pip, sudo and nose: RUN yum install -y python-pip sudo +# Use pipstrap to install a stable and tested version of pip +COPY ./pieces/pipstrap.py /opt +RUN /opt/pipstrap.py RUN pip install nose # Add an unprivileged user: diff --git a/letsencrypt-auto-source/Dockerfile.precise b/letsencrypt-auto-source/Dockerfile.precise index 5ee32c7cc..a654a4ebc 100644 --- a/letsencrypt-auto-source/Dockerfile.precise +++ b/letsencrypt-auto-source/Dockerfile.precise @@ -11,7 +11,9 @@ RUN apt-get update && \ apt-get -q -y install python-pip sudo openssl && \ apt-get clean -ENV PIP_INDEX_URL https://pypi.python.org/simple +# Use pipstrap to install a stable and tested version of pip +COPY ./pieces/pipstrap.py /opt +RUN /opt/pipstrap.py RUN pip install nose # Let that user sudo: diff --git a/letsencrypt-auto-source/Dockerfile.trusty b/letsencrypt-auto-source/Dockerfile.trusty index 23e8f26de..424401dcc 100644 --- a/letsencrypt-auto-source/Dockerfile.trusty +++ b/letsencrypt-auto-source/Dockerfile.trusty @@ -15,6 +15,9 @@ RUN sed -i.bkp -e \ RUN apt-get update && \ apt-get -q -y install python-pip && \ apt-get clean +# Use pipstrap to install a stable and tested version of pip +COPY ./pieces/pipstrap.py /opt +RUN /opt/pipstrap.py RUN pip install nose RUN mkdir -p /home/lea/certbot diff --git a/letsencrypt-auto-source/Dockerfile.wheezy b/letsencrypt-auto-source/Dockerfile.wheezy index acdb791a4..24a2a6356 100644 --- a/letsencrypt-auto-source/Dockerfile.wheezy +++ b/letsencrypt-auto-source/Dockerfile.wheezy @@ -10,8 +10,9 @@ RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups sudo - RUN apt-get update && \ apt-get -q -y install python-pip sudo openssl && \ apt-get clean - -ENV PIP_INDEX_URL https://pypi.python.org/simple +# Use pipstrap to install a stable and tested version of pip +COPY ./pieces/pipstrap.py /opt +RUN /opt/pipstrap.py RUN pip install nose # Let that user sudo: