Skip to content

Commit 31452bc

Browse files
authored
Fix Raqm install on CentOS Stream 9 and libimagequant on Amazon Linux 2 (#245)
2 parents 9853976 + 9a559df commit 31452bc

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

amazon-2-amd64/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN yum install -y \
1515
libjpeg-devel \
1616
libtiff-devel \
1717
make \
18-
openssl11-devel \
18+
openssl-devel \
1919
pth-devel \
2020
shadow-utils \
2121
sqlite-devel \
@@ -36,6 +36,14 @@ ENV PATH="/root/.cargo/bin:${PATH}"
3636

3737
RUN useradd --uid 1001 pillow
3838

39+
ADD depends /depends
40+
RUN cd /depends \
41+
&& ./install_imagequant.sh
42+
43+
RUN yum remove -y openssl-devel && \
44+
yum install -y openssl11-devel && \
45+
yum clean all
46+
3947
RUN wget https://www.python.org/ftp/python/3.10.18/Python-3.10.18.tgz \
4048
&& tar xzf Python-3.10.18.tgz \
4149
&& cd Python-3.10.18 \
@@ -54,14 +62,12 @@ RUN bash -c "python3.10 -m pip install virtualenv \
5462
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
5563
&& chown -R pillow:pillow /vpy3"
5664

57-
ADD depends /depends
5865
RUN wget https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux.zip \
5966
&& unzip ninja-linux.zip \
6067
&& mv ninja /usr/bin
6168
RUN python3.10 -m pip install meson
6269
RUN ln -s /usr/local/bin/python3.10 /usr/bin/python3
6370
RUN cd /depends \
64-
&& ./install_imagequant.sh \
6571
&& ./install_openjpeg.sh \
6672
&& ./install_raqm.sh \
6773
&& ./install_webp.sh

centos-stream-9-amd64/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ RUN yum install -y \
1717
libtiff-devel \
1818
libwebp-devel \
1919
make \
20-
meson \
2120
nasm \
21+
ninja-build \
2222
openjpeg2-devel \
2323
openssl-devel \
2424
sqlite-devel \
@@ -53,6 +53,7 @@ RUN bash -c "python3.10 -m pip install virtualenv \
5353

5454
COPY depends /depends
5555
RUN ln -sf /usr/local/bin/python3.10 /usr/bin/python3
56+
RUN /usr/bin/python3 -m pip install --no-cache-dir meson
5657
RUN cd /depends \
5758
&& ./install_imagequant.sh \
5859
&& ./install_libavif.sh \

0 commit comments

Comments
 (0)