Merge pull request #188 from radarhere/libimagequant-dev

Do not use install_imagequant.sh on Jammy
python-pillow · Aug 18, 2023 · 12fef87 · 12fef87
2 parents e13a753 + 066bd28
commit 12fef87
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile b/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    cargo \
     cmake \
     ghostscript \
     git \
     libffi-dev \
     libfreetype6-dev \
     libfribidi-dev \
     libharfbuzz-dev \
+    libimagequant-dev \
     libjpeg-turbo-progs \
     libjpeg8-dev \
     liblcms2-dev \
@@ -45,7 +45,6 @@ RUN virtualenv -p /usr/bin/python3.10-dbg --system-site-packages /vpy3 \
 
 ADD depends /depends
 RUN cd /depends \
-    && ./install_imagequant.sh \
     && ./install_raqm.sh
 
 COPY python.supp /depends

diff --git a/ubuntu-22.04-jammy-amd64/Dockerfile b/ubuntu-22.04-jammy-amd64/Dockerfile
@@ -1,7 +1,6 @@
 FROM ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    cargo \
     cmake \
     ghostscript \
     git \
@@ -10,6 +9,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     libfreetype6-dev \
     libfribidi-dev \
     libharfbuzz-dev \
+    libimagequant-dev \
     libjpeg-turbo-progs \
     libjpeg8-dev \
     liblcms2-dev \
@@ -52,7 +52,6 @@ RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
 
 ADD depends /depends
 RUN cd /depends \
-    && ./install_imagequant.sh \
     && ./install_raqm.sh
 
 USER pillow

diff --git a/ubuntu-22.04-jammy-arm64v8/Dockerfile b/ubuntu-22.04-jammy-arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 FROM arm64v8/ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    cargo \
     cmake \
     ghostscript \
     git \
     libffi-dev \
     libfreetype6-dev \
     libfribidi-dev \
     libharfbuzz-dev \
+    libimagequant-dev \
     libjpeg-turbo-progs \
     libjpeg8-dev \
     liblcms2-dev \
@@ -43,7 +43,6 @@ RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
 
 ADD depends /depends
 RUN cd /depends \
-    && ./install_imagequant.sh \
     && ./install_raqm.sh
 
 USER pillow

diff --git a/ubuntu-22.04-jammy-ppc64le/Dockerfile b/ubuntu-22.04-jammy-ppc64le/Dockerfile
@@ -1,14 +1,14 @@
 FROM ppc64le/ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    cargo \
     cmake \
     ghostscript \
     git \
     libffi-dev \
     libfreetype6-dev \
     libfribidi-dev \
     libharfbuzz-dev \
+    libimagequant-dev \
     libjpeg-turbo-progs \
     libjpeg8-dev \
     liblcms2-dev \
@@ -43,7 +43,6 @@ RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
 
 ADD depends /depends
 RUN cd /depends \
-    && ./install_imagequant.sh \
     && ./install_raqm.sh
 
 USER pillow

diff --git a/ubuntu-22.04-jammy-s390x/Dockerfile b/ubuntu-22.04-jammy-s390x/Dockerfile
@@ -41,7 +41,6 @@ RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
 
 ADD depends /depends
 RUN cd /depends \
-    && ./install_imagequant.sh \
     && ./install_raqm.sh \
     && ./install_webp.sh