From 7a1012ec58e9751d5d203f89f79ab45bee4f9b4f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 2 Aug 2025 15:27:05 +1000 Subject: [PATCH 1/2] Fixed raqm install on CentOS Stream 9 --- centos-stream-9-amd64/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/centos-stream-9-amd64/Dockerfile b/centos-stream-9-amd64/Dockerfile index ff5684eb..3e388aa5 100644 --- a/centos-stream-9-amd64/Dockerfile +++ b/centos-stream-9-amd64/Dockerfile @@ -17,8 +17,8 @@ RUN yum install -y \ libtiff-devel \ libwebp-devel \ make \ - meson \ nasm \ + ninja-build \ openjpeg2-devel \ openssl-devel \ sqlite-devel \ @@ -53,6 +53,7 @@ RUN bash -c "python3.10 -m pip install virtualenv \ COPY depends /depends RUN ln -sf /usr/local/bin/python3.10 /usr/bin/python3 +RUN /usr/bin/python3 -m pip install --no-cache-dir meson RUN cd /depends \ && ./install_imagequant.sh \ && ./install_libavif.sh \ From 9a559dfcdb256807e27d1badb40ab570a7485d84 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 2 Aug 2025 17:16:10 +1000 Subject: [PATCH 2/2] Fixed libimagequant install on Amazon Linux 2 --- amazon-2-amd64/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile index 55d1b724..93ef16f6 100644 --- a/amazon-2-amd64/Dockerfile +++ b/amazon-2-amd64/Dockerfile @@ -15,7 +15,7 @@ RUN yum install -y \ libjpeg-devel \ libtiff-devel \ make \ - openssl11-devel \ + openssl-devel \ pth-devel \ shadow-utils \ sqlite-devel \ @@ -36,6 +36,14 @@ ENV PATH="/root/.cargo/bin:${PATH}" RUN useradd --uid 1001 pillow +ADD depends /depends +RUN cd /depends \ + && ./install_imagequant.sh + +RUN yum remove -y openssl-devel && \ + yum install -y openssl11-devel && \ + yum clean all + RUN wget https://www.python.org/ftp/python/3.10.18/Python-3.10.18.tgz \ && tar xzf Python-3.10.18.tgz \ && cd Python-3.10.18 \ @@ -54,14 +62,12 @@ RUN bash -c "python3.10 -m pip install virtualenv \ && /vpy3/bin/pip install numpy --only-binary=:all: || true \ && chown -R pillow:pillow /vpy3" -ADD depends /depends RUN wget https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux.zip \ && unzip ninja-linux.zip \ && mv ninja /usr/bin RUN python3.10 -m pip install meson RUN ln -s /usr/local/bin/python3.10 /usr/bin/python3 RUN cd /depends \ - && ./install_imagequant.sh \ && ./install_openjpeg.sh \ && ./install_raqm.sh \ && ./install_webp.sh