Use pngquant from package manager

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index f047d5e92385deaa998037a9882d7bf1941d20cb..07ea10c5f6213edd2e9a458860fe5bb021729310 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -40,7 +40,7 @@ RUN apt -y install build-essential rsync \
                        anacron wget \
                        psmisc vim whois brotli libunwind-dev \
                        libtcmalloc-minimal4 cmake \
-                       pngcrush
+                       pngcrush pngquant
 RUN sed -i -e 's/start -q anacron/anacron -s/' /etc/cron.d/anacron
 RUN sed -i.bak 's/$ModLoad imklog/#$ModLoad imklog/' /etc/rsyslog.conf
 RUN sed -i.bak 's/module(load="imklog")/#module(load="imklog")/' /etc/rsyslog.conf
@@ -91,9 +91,6 @@ RUN /tmp/install-imagemagick
 # Validate install
 RUN ruby -Eutf-8 -e "v = \`convert -version\`; %w{png tiff jpeg freetype heic}.each { |f| unless v.include?(f); STDERR.puts('no ' + f +  ' support in imagemagick'); exit(-1); end }"
 
-ADD install-pngquant /tmp/install-pngquant
-RUN /tmp/install-pngquant
-
 # This tool allows us to disable huge page support for our current process
 # since the flag is preserved through forks and execs it can be used on any
 # process

diff --git a/image/base/install-pngquant b/image/base/install-pngquant
deleted file mode 100755 (executable)
index ec7bd06..0000000
--- a/image/base/install-pngquant
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-# version check: https://pngquant.org/
-VERSION=2.12.5
-
-cd /tmp
-git clone -b $VERSION --single-branch https://github.com/pornel/pngquant
-cd pngquant
-make && make install
-cd /
-rm -fr /tmp/pngq*