Skip to content

Commit 01fa823

Browse files
committed
Always upgrade pip
1 parent b6b890e commit 01fa823

File tree

10 files changed

+19
-0
lines changed

10 files changed

+19
-0
lines changed

alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ RUN cd /depends && ./install_webp.sh && ./install_imagequant.sh && ./install_raq
3434

3535
RUN /usr/sbin/adduser -D pillow && \
3636
pip install virtualenv && virtualenv /vpy && \
37+
/vpy/bin/pip install --upgrade pip && \
3738
/vpy/bin/pip install olefile pytest pytest-cov && \
3839
chown -R pillow:pillow /vpy && \
3940
virtualenv -p python3.6 /vpy3 && \
41+
/vpy3/bin/pip install --upgrade pip && \
4042
/vpy3/bin/pip install olefile pytest pytest-cov && \
4143
chown -R pillow:pillow /vpy3
4244

amazon-1-amd64/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ run yum install -y shadow-utils util-linux xorg-x11-xauth \
1111
RUN useradd --uid 1000 pillow
1212

1313
RUN bash -c "/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
14+
/vpy/bin/pip install --upgrade pip && \
1415
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
1516
chown -R pillow:pillow /vpy && \
1617
/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
18+
/vpy3/bin/pip install --upgrade pip && \
1719
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
1820
chown -R pillow:pillow /vpy3"
1921

amazon-2-amd64/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN useradd --uid 1000 pillow
1515

1616
RUN bash -c "/usr/bin/pip3 install virtualenv && \
1717
/usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy && \
18+
/vpy/bin/pip install --upgrade pip && \
1819
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
1920
chown -R pillow:pillow /vpy "
2021

arch/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ RUN cd /depends && ./install_imagequant.sh && ./install_raqm.sh
3535

3636
RUN /sbin/useradd -m -U -u 1000 pillow && \
3737
virtualenv2 --system-site-packages /vpy && \
38+
/vpy/bin/pip install --upgrade pip && \
3839
/vpy/bin/pip install nose cffi olefile pytest pytest-cov && \
3940
chown -R pillow:pillow /vpy && \
4041
virtualenv --system-site-packages /vpy3 && \
42+
/vpy3/bin/pip install --upgrade pip && \
4143
/vpy3/bin/pip install nose cffi olefile pytest pytest-cov && \
4244
chown -R pillow:pillow /vpy3
4345

centos-6-amd64/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ RUN useradd --uid 1000 pillow
1212

1313
RUN bash -c "source /opt/rh/python27/enable && \
1414
/opt/rh/python27/root/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
15+
/vpy/bin/pip install --upgrade pip && \
1516
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
1617
cat /opt/rh/python27/enable /vpy/bin/activate > /vpy/bin/activate2.7 && \
1718
mv /vpy/bin/activate2.7 /vpy/bin/activate && \
1819
chown -R pillow:pillow /vpy && \
1920
source /opt/rh/rh-python36/enable && \
2021
/opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
22+
/vpy3/bin/pip install --upgrade pip && \
2123
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
2224
cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \
2325
mv /vpy3/bin/activate3.6 /vpy3/bin/activate && \

centos-7-amd64/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ RUN useradd --uid 1000 pillow
1313

1414
RUN bash -c "source /opt/rh/python27/enable && \
1515
/opt/rh/python27/root/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
16+
/vpy/bin/pip install --upgrade pip && \
1617
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
1718
cat /opt/rh/python27/enable /vpy/bin/activate > /vpy/bin/activate2.7 && \
1819
mv /vpy/bin/activate2.7 /vpy/bin/activate && \
1920
chown -R pillow:pillow /vpy && \
2021
source /opt/rh/rh-python36/enable && \
2122
/opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
23+
/vpy3/bin/pip install --upgrade pip && \
2224
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
2325
cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \
2426
mv /vpy3/bin/activate3.6 /vpy3/bin/activate && \

debian-stretch-x86/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ RUN useradd pillow && addgroup pillow sudo && \
4646
mkdir /home/pillow && chown pillow:pillow /home/pillow
4747

4848
RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
49+
/vpy/bin/pip install --upgrade pip && \
4950
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
5051
chown -R pillow:pillow /vpy && \
5152
virtualenv -p /usr/bin/python3.5 --system-site-packages /vpy3 && \
53+
/vpy3/bin/pip install --upgrade pip && \
5254
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
5355
chown -R pillow:pillow /vpy3
5456

fedora-28-amd64/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ RUN useradd pillow && \
1212
chown pillow:pillow /home/pillow
1313

1414
RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
15+
/vpy/bin/pip install --upgrade pip && \
1516
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
1617
chown -R pillow:pillow /vpy && \
1718
virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 && \
19+
/vpy3/bin/pip install --upgrade pip && \
1820
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
1921
chown -R pillow:pillow /vpy3
2022

fedora-29-amd64/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ RUN useradd pillow && \
1212
chown pillow:pillow /home/pillow
1313

1414
RUN /usr/bin/python2.7 /usr/lib/python2.7/site-packages/virtualenv.py --system-site-packages /vpy && \
15+
/vpy/bin/pip install --upgrade pip && \
1516
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
1617
chown -R pillow:pillow /vpy && \
1718
/usr/bin/python3.7 /usr/lib/python3.7/site-packages/virtualenv.py --system-site-packages /vpy3 && \
19+
/vpy3/bin/pip install --upgrade pip && \
1820
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
1921
chown -R pillow:pillow /vpy3
2022

ubuntu-18.04-bionic-amd64/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ RUN useradd pillow && addgroup pillow sudo && \
1515
mkdir /home/pillow && chown pillow:pillow /home/pillow
1616

1717
RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
18+
/vpy/bin/pip install --upgrade pip && \
1819
/vpy/bin/pip install cffi olefile pytest pytest-cov && \
1920
chown -R pillow:pillow /vpy && \
2021
virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 && \
22+
/vpy3/bin/pip install --upgrade pip && \
2123
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
2224
chown -R pillow:pillow /vpy3
2325

0 commit comments

Comments
 (0)