From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Wed, 27 Jan 2021 17:13:56 +0000 (-0300)
Subject: Use pngcrush from package manager
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fb65fc275ca328013bf576f1fe33f2ce17e8ffbb;p=discourse_docker.git

Use pngcrush from package manager
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 6f3d5a8..f047d5e 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -39,7 +39,8 @@ RUN apt -y install build-essential rsync \
                        postgresql-contrib-${PG_MAJOR} libpq-dev libreadline-dev \
                        anacron wget \
                        psmisc vim whois brotli libunwind-dev \
-                       libtcmalloc-minimal4 cmake
+                       libtcmalloc-minimal4 cmake \
+                       pngcrush
 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
@@ -90,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-pngcrush /tmp/install-pngcrush
-RUN /tmp/install-pngcrush
-
 ADD install-pngquant /tmp/install-pngquant
 RUN /tmp/install-pngquant
 
diff --git a/image/base/install-pngcrush b/image/base/install-pngcrush
deleted file mode 100755
index 40b8349..0000000
--- a/image/base/install-pngcrush
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-# version check: https://sourceforge.net/projects/pmt/files/pngcrush/
-PNGCRUSH_VERSION=1.8.13
-PNGCRUSH_HASH="bac37d4b2be88d7e88aadcde9661beb3a513a90e7d26784f906c1e2da8ba332e"
-
-cd /tmp
-wget https://sourceforge.net/projects/pmt/files/pngcrush/$PNGCRUSH_VERSION/pngcrush-$PNGCRUSH_VERSION.tar.gz/download -O pngcrush-$PNGCRUSH_VERSION.tar.gz
-sha256sum pngcrush-$PNGCRUSH_VERSION.tar.gz
-echo "$PNGCRUSH_HASH pngcrush-$PNGCRUSH_VERSION.tar.gz" | sha256sum -c
-
-tar zxf pngcrush-$PNGCRUSH_VERSION.tar.gz
-cd pngcrush-$PNGCRUSH_VERSION
-make && cp -f pngcrush /usr/local/bin
-cd /
-rm -fr /tmp/pngcrush-$PNGCRUSH_VERSION
-rm /tmp/pngcrush-$PNGCRUSH_VERSION.tar.gz