@@ -31,12 +31,14 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3131# Pillow customization
3232#
3333
34- RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
34+ SHELL ["/bin/bash" , "-o" , "pipefail" , "-c" ]
35+
36+ RUN apt-get -qq update \
37+ && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3538 cmake \
36- curl \
39+ g++ \
3740 ghostscript \
3841 git \
39- libffi-dev \
4042 libfreetype6-dev \
4143 libfribidi-dev \
4244 libharfbuzz-dev \
@@ -48,6 +50,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
4850 libwebp-dev \
4951 libssl-dev \
5052 meson \
53+ nasm \
5154 netpbm \
5255 python3-dev \
5356 python3-numpy \
@@ -58,24 +61,30 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
5861 tk8.6-dev \
5962 virtualenv \
6063 wget \
64+ xauth \
6165 xvfb \
6266 zlib1g-dev \
6367 && rm -rf /var/lib/apt/lists/*
6468
65- RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
69+ RUN wget -qO- https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
6670ENV PATH="/root/.cargo/bin:${PATH}"
6771
68- RUN useradd pillow \
72+ RUN useradd -u 1001 pillow \
6973 && mkdir /home/pillow \
7074 && chown pillow:pillow /home/pillow
7175
76+ ARG PIP_DISABLE_PIP_VERSION_CHECK=1
77+ ARG PIP_NO_CACHE_DIR=1
78+
7279RUN virtualenv -p /usr/bin/python3.11 --system-site-packages /vpy3 \
73- && /vpy3/bin/pip install --no-cache-dir -- upgrade pip \
74- && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
80+ && /vpy3/bin/pip install --upgrade pip \
81+ && /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
7582 && chown -R pillow:pillow /vpy3
7683
77- ADD depends /depends
78- RUN cd /depends && ./install_imagequant.sh && ./install_raqm.sh
84+ COPY depends /depends
85+ RUN cd /depends && ./install_imagequant.sh && ./install_libavif.sh && ./install_raqm.sh
86+
87+ ENV FORCE_COLOR=1
7988
8089USER pillow
8190ENTRYPOINT ["linux32" ]
0 commit comments