From ad3fe3dfdb97e1b804a935228b8297d23d257d06 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 24 Nov 2020 17:00:29 +0200 Subject: [PATCH 1/2] Move && to start of line for readability --- alpine/Dockerfile | 22 +++++++++++----------- amazon-1-amd64/Dockerfile | 16 ++++++++-------- amazon-2-amd64/Dockerfile | 20 ++++++++++---------- arch/Dockerfile | 20 ++++++++++---------- centos-6-amd64/Dockerfile | 16 ++++++++-------- centos-7-amd64/Dockerfile | 16 ++++++++-------- centos-8-amd64/Dockerfile | 10 +++++----- debian-10-buster-x86/Dockerfile | 16 +++++++++------- fedora-32-amd64/Dockerfile | 14 +++++++------- ubuntu-18.04-bionic-amd64/Dockerfile | 22 +++++++++++----------- ubuntu-20.04-focal-amd64/Dockerfile | 22 +++++++++++----------- 11 files changed, 98 insertions(+), 96 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 2da559e3..11f9c144 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -31,18 +31,18 @@ RUN apk --no-cache add \ zlib-dev ADD depends /depends -RUN cd /depends && \ - ./install_webp.sh && \ - ./install_imagequant.sh && \ - ./install_raqm.sh +RUN cd /depends \ + && ./install_webp.sh \ + && ./install_imagequant.sh \ + && ./install_raqm.sh -RUN /usr/sbin/adduser -D pillow && \ - pip3 install -I virtualenv && \ - virtualenv /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - chown -R pillow:pillow /vpy3 +RUN /usr/sbin/adduser -D pillow \ + && pip3 install -I virtualenv \ + && virtualenv /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3 USER pillow CMD ["depends/test.sh"] diff --git a/amazon-1-amd64/Dockerfile b/amazon-1-amd64/Dockerfile index 47cc6957..ae21bd22 100644 --- a/amazon-1-amd64/Dockerfile +++ b/amazon-1-amd64/Dockerfile @@ -26,16 +26,16 @@ RUN yum install -y \ RUN useradd --uid 1000 pillow -RUN bash -c "/usr/bin/virtualenv-3.6 -p python3.6 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - chown -R pillow:pillow /vpy3" +RUN bash -c "/usr/bin/virtualenv-3.6 -p python3.6 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3" ADD depends /depends -RUN cd /depends && \ - ./install_imagequant.sh && \ - ./install_openjpeg.sh +RUN cd /depends \ + && ./install_imagequant.sh \ + && ./install_openjpeg.sh USER pillow CMD ["depends/test.sh"] diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile index 369e5a38..3b8c1130 100644 --- a/amazon-2-amd64/Dockerfile +++ b/amazon-2-amd64/Dockerfile @@ -35,18 +35,18 @@ RUN yum install -y \ RUN useradd --uid 1000 pillow -RUN bash -c "/usr/bin/pip3 install virtualenv && \ - /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - chown -R pillow:pillow /vpy3" +RUN bash -c "/usr/bin/pip3 install virtualenv \ + && /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3" ADD depends /depends -RUN cd /depends && \ - ./install_imagequant.sh && \ - ./install_openjpeg.sh && \ - ./install_raqm.sh +RUN cd /depends \ + && ./install_imagequant.sh \ + && ./install_openjpeg.sh \ + && ./install_raqm.sh USER pillow CMD ["depends/test.sh"] diff --git a/arch/Dockerfile b/arch/Dockerfile index 4c21edef..52cb1e73 100644 --- a/arch/Dockerfile +++ b/arch/Dockerfile @@ -33,17 +33,17 @@ RUN pacman -Sy --noconfirm \ && find /var/cache/pacman/ -type f -delete ADD depends /depends -RUN cd /depends && \ - ./install_imagequant.sh && \ - ./install_raqm.sh +RUN cd /depends \ + && ./install_imagequant.sh \ + && ./install_raqm.sh -RUN /sbin/useradd -m -U -u 1000 pillow && \ - virtualenv --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install --upgrade setuptools>=49.3.2 && \ - /vpy3/bin/pip install nose cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - chown -R pillow:pillow /vpy3 +RUN /sbin/useradd -m -U -u 1000 pillow \ + && virtualenv --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install --upgrade setuptools>=49.3.2 \ + && /vpy3/bin/pip install nose cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3 USER pillow CMD ["depends/test.sh"] diff --git a/centos-6-amd64/Dockerfile b/centos-6-amd64/Dockerfile index 15886ed7..d444fb46 100644 --- a/centos-6-amd64/Dockerfile +++ b/centos-6-amd64/Dockerfile @@ -27,14 +27,14 @@ RUN yum install -y \ RUN useradd --uid 1000 pillow -RUN bash -c "source /opt/rh/rh-python36/enable && \ - /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \ - mv /vpy3/bin/activate3.6 /vpy3/bin/activate && \ - chown -R pillow:pillow /vpy3" +RUN bash -c "source /opt/rh/rh-python36/enable \ + && /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 \ + && mv /vpy3/bin/activate3.6 /vpy3/bin/activate \ + && chown -R pillow:pillow /vpy3" ADD depends /depends #RUN cd /depends && ./install_imagequant.sh diff --git a/centos-7-amd64/Dockerfile b/centos-7-amd64/Dockerfile index 85e1df74..3241a8db 100644 --- a/centos-7-amd64/Dockerfile +++ b/centos-7-amd64/Dockerfile @@ -29,14 +29,14 @@ RUN yum install -y \ RUN useradd --uid 1000 pillow -RUN bash -c "source /opt/rh/rh-python36/enable && \ - /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \ - mv /vpy3/bin/activate3.6 /vpy3/bin/activate && \ - chown -R pillow:pillow /vpy3" +RUN bash -c "source /opt/rh/rh-python36/enable \ + && /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 \ + && mv /vpy3/bin/activate3.6 /vpy3/bin/activate \ + && chown -R pillow:pillow /vpy3" ADD depends /depends diff --git a/centos-8-amd64/Dockerfile b/centos-8-amd64/Dockerfile index d09ddd3e..580a495a 100644 --- a/centos-8-amd64/Dockerfile +++ b/centos-8-amd64/Dockerfile @@ -34,11 +34,11 @@ RUN yum install -y \ RUN useradd --uid 1000 pillow -RUN bash -c "/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - chown -R pillow:pillow /vpy3" +RUN bash -c "/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3" ADD depends /depends diff --git a/debian-10-buster-x86/Dockerfile b/debian-10-buster-x86/Dockerfile index fab745da..2aad9def 100644 --- a/debian-10-buster-x86/Dockerfile +++ b/debian-10-buster-x86/Dockerfile @@ -61,14 +61,16 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ zlib1g-dev \ && rm -rf /var/lib/apt/lists/* -RUN useradd pillow && addgroup pillow sudo && \ - mkdir /home/pillow && chown pillow:pillow /home/pillow +RUN useradd pillow \ + && addgroup pillow sudo \ + && mkdir /home/pillow \ + && chown pillow:pillow /home/pillow -RUN virtualenv -p /usr/bin/python3.7 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - chown -R pillow:pillow /vpy3 +RUN virtualenv -p /usr/bin/python3.7 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3 ADD depends /depends RUN cd /depends && ./install_imagequant.sh && ./install_raqm.sh diff --git a/fedora-32-amd64/Dockerfile b/fedora-32-amd64/Dockerfile index 499df92d..34fd388b 100644 --- a/fedora-32-amd64/Dockerfile +++ b/fedora-32-amd64/Dockerfile @@ -24,14 +24,14 @@ RUN dnf install -y \ zlib-devel \ && dnf clean all -RUN useradd pillow && \ - chown pillow:pillow /home/pillow +RUN useradd pillow \ + && chown pillow:pillow /home/pillow -RUN /usr/bin/python3.8 /usr/lib/python3.8/site-packages/virtualenv.py --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - /vpy3/bin/pip install numpy --only-binary=:all: || true && \ - chown -R pillow:pillow /vpy3 +RUN /usr/bin/python3.8 /usr/lib/python3.8/site-packages/virtualenv.py --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3 ADD depends /depends diff --git a/ubuntu-18.04-bionic-amd64/Dockerfile b/ubuntu-18.04-bionic-amd64/Dockerfile index 97fb7446..ab1059ed 100644 --- a/ubuntu-18.04-bionic-amd64/Dockerfile +++ b/ubuntu-18.04-bionic-amd64/Dockerfile @@ -29,20 +29,20 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ zlib1g-dev \ && rm -rf /var/lib/apt/lists/* -RUN useradd pillow && \ - addgroup pillow sudo && \ - mkdir /home/pillow && \ - chown pillow:pillow /home/pillow +RUN useradd pillow \ + && addgroup pillow sudo \ + && mkdir /home/pillow \ + && chown pillow:pillow /home/pillow -RUN virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - chown -R pillow:pillow /vpy3 +RUN virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && chown -R pillow:pillow /vpy3 ADD depends /depends -RUN cd /depends && \ - ./install_imagequant.sh && \ - ./install_raqm.sh +RUN cd /depends \ + && ./install_imagequant.sh \ + && ./install_raqm.sh USER pillow CMD ["depends/test.sh"] diff --git a/ubuntu-20.04-focal-amd64/Dockerfile b/ubuntu-20.04-focal-amd64/Dockerfile index 4b9c8e37..492dd066 100644 --- a/ubuntu-20.04-focal-amd64/Dockerfile +++ b/ubuntu-20.04-focal-amd64/Dockerfile @@ -29,20 +29,20 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ zlib1g-dev \ && rm -rf /var/lib/apt/lists/* -RUN useradd pillow && \ - addgroup pillow sudo && \ - mkdir /home/pillow && \ - chown pillow:pillow /home/pillow +RUN useradd pillow \ + && addgroup pillow sudo \ + && mkdir /home/pillow \ + && chown pillow:pillow /home/pillow -RUN virtualenv -p /usr/bin/python3.8 --system-site-packages /vpy3 && \ - /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ - chown -R pillow:pillow /vpy3 +RUN virtualenv -p /usr/bin/python3.8 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && chown -R pillow:pillow /vpy3 ADD depends /depends -RUN cd /depends && \ - ./install_imagequant.sh && \ - ./install_raqm.sh +RUN cd /depends \ + && ./install_imagequant.sh \ + && ./install_raqm.sh USER pillow CMD ["depends/test.sh"] From 70ea2626255d11f02e5b7056e269cac3ac3b0e26 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 24 Nov 2020 17:20:41 +0200 Subject: [PATCH 2/2] Don't cache pip --- alpine/Dockerfile | 8 ++++---- amazon-1-amd64/Dockerfile | 6 +++--- amazon-2-amd64/Dockerfile | 6 +++--- arch/Dockerfile | 8 ++++---- centos-6-amd64/Dockerfile | 6 +++--- centos-7-amd64/Dockerfile | 6 +++--- centos-8-amd64/Dockerfile | 6 +++--- debian-10-buster-x86/Dockerfile | 6 +++--- fedora-32-amd64/Dockerfile | 6 +++--- fedora-33-amd64/Dockerfile | 8 ++++---- ubuntu-18.04-bionic-amd64/Dockerfile | 4 ++-- ubuntu-20.04-focal-amd64/Dockerfile | 4 ++-- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 11f9c144..8e73ac8a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -37,11 +37,11 @@ RUN cd /depends \ && ./install_raqm.sh RUN /usr/sbin/adduser -D pillow \ - && pip3 install -I virtualenv \ + && pip3 install --no-cache-dir -I virtualenv \ && virtualenv /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3 USER pillow diff --git a/amazon-1-amd64/Dockerfile b/amazon-1-amd64/Dockerfile index ae21bd22..31159c34 100644 --- a/amazon-1-amd64/Dockerfile +++ b/amazon-1-amd64/Dockerfile @@ -27,9 +27,9 @@ RUN yum install -y \ RUN useradd --uid 1000 pillow RUN bash -c "/usr/bin/virtualenv-3.6 -p python3.6 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3" ADD depends /depends diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile index 3b8c1130..73bde739 100644 --- a/amazon-2-amd64/Dockerfile +++ b/amazon-2-amd64/Dockerfile @@ -37,9 +37,9 @@ RUN useradd --uid 1000 pillow RUN bash -c "/usr/bin/pip3 install virtualenv \ && /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3" ADD depends /depends diff --git a/arch/Dockerfile b/arch/Dockerfile index 52cb1e73..240d6950 100644 --- a/arch/Dockerfile +++ b/arch/Dockerfile @@ -39,10 +39,10 @@ RUN cd /depends \ RUN /sbin/useradd -m -U -u 1000 pillow \ && virtualenv --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install --upgrade setuptools>=49.3.2 \ - && /vpy3/bin/pip install nose cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir --upgrade setuptools>=49.3.2 \ + && /vpy3/bin/pip install --no-cache-dir nose cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3 USER pillow diff --git a/centos-6-amd64/Dockerfile b/centos-6-amd64/Dockerfile index d444fb46..412169a2 100644 --- a/centos-6-amd64/Dockerfile +++ b/centos-6-amd64/Dockerfile @@ -29,9 +29,9 @@ RUN useradd --uid 1000 pillow RUN bash -c "source /opt/rh/rh-python36/enable \ && /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 \ && mv /vpy3/bin/activate3.6 /vpy3/bin/activate \ && chown -R pillow:pillow /vpy3" diff --git a/centos-7-amd64/Dockerfile b/centos-7-amd64/Dockerfile index 3241a8db..afe37cc8 100644 --- a/centos-7-amd64/Dockerfile +++ b/centos-7-amd64/Dockerfile @@ -31,9 +31,9 @@ RUN useradd --uid 1000 pillow RUN bash -c "source /opt/rh/rh-python36/enable \ && /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 \ && mv /vpy3/bin/activate3.6 /vpy3/bin/activate \ && chown -R pillow:pillow /vpy3" diff --git a/centos-8-amd64/Dockerfile b/centos-8-amd64/Dockerfile index 580a495a..79a88adc 100644 --- a/centos-8-amd64/Dockerfile +++ b/centos-8-amd64/Dockerfile @@ -35,9 +35,9 @@ RUN yum install -y \ RUN useradd --uid 1000 pillow RUN bash -c "/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3" ADD depends /depends diff --git a/debian-10-buster-x86/Dockerfile b/debian-10-buster-x86/Dockerfile index 2aad9def..de59c44b 100644 --- a/debian-10-buster-x86/Dockerfile +++ b/debian-10-buster-x86/Dockerfile @@ -67,9 +67,9 @@ RUN useradd pillow \ && chown pillow:pillow /home/pillow RUN virtualenv -p /usr/bin/python3.7 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3 ADD depends /depends diff --git a/fedora-32-amd64/Dockerfile b/fedora-32-amd64/Dockerfile index 34fd388b..da938f15 100644 --- a/fedora-32-amd64/Dockerfile +++ b/fedora-32-amd64/Dockerfile @@ -28,9 +28,9 @@ RUN useradd pillow \ && chown pillow:pillow /home/pillow RUN /usr/bin/python3.8 /usr/lib/python3.8/site-packages/virtualenv.py --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3 ADD depends /depends diff --git a/fedora-33-amd64/Dockerfile b/fedora-33-amd64/Dockerfile index 7a072866..985ece0b 100644 --- a/fedora-33-amd64/Dockerfile +++ b/fedora-33-amd64/Dockerfile @@ -28,10 +28,10 @@ RUN useradd pillow \ && chown pillow:pillow /home/pillow RUN virtualenv -p /usr/bin/python3.9 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install --upgrade setuptools>=49.3.2 \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ - && /vpy3/bin/pip install numpy --only-binary=:all: || true \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir --upgrade setuptools>=49.3.2 \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3 ADD depends /depends diff --git a/ubuntu-18.04-bionic-amd64/Dockerfile b/ubuntu-18.04-bionic-amd64/Dockerfile index ab1059ed..b6b3b8f5 100644 --- a/ubuntu-18.04-bionic-amd64/Dockerfile +++ b/ubuntu-18.04-bionic-amd64/Dockerfile @@ -35,8 +35,8 @@ RUN useradd pillow \ && chown pillow:pillow /home/pillow RUN virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ && chown -R pillow:pillow /vpy3 ADD depends /depends diff --git a/ubuntu-20.04-focal-amd64/Dockerfile b/ubuntu-20.04-focal-amd64/Dockerfile index 492dd066..93ee41e1 100644 --- a/ubuntu-20.04-focal-amd64/Dockerfile +++ b/ubuntu-20.04-focal-amd64/Dockerfile @@ -35,8 +35,8 @@ RUN useradd pillow \ && chown pillow:pillow /home/pillow RUN virtualenv -p /usr/bin/python3.8 --system-site-packages /vpy3 \ - && /vpy3/bin/pip install --upgrade pip \ - && /vpy3/bin/pip install cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ && chown -R pillow:pillow /vpy3 ADD depends /depends