From 4a69acfb2f5db3a696e7d976c06d17c6d83b3691 Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Thu, 2 Sep 2021 16:45:15 +0200
Subject: [PATCH] Uses pngquant from package manager.

---
 Dockerfile       | 3 +--
 install/pngquant | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100755 install/pngquant

diff --git a/Dockerfile b/Dockerfile
index 5064182..a8a23ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,6 @@ ENV RAILS_ENV=production \
     DISCOURSE_REDIS_HOST=redis \
     DISCOURSE_SERVE_STATIC_ASSETS=true \
     DISCOURSE_VERSION=${DISCOURSE_VERSION} \
-    PNGQUANT_VERSION=2.12.5 \
     PNGCRUSH_VERSION=1.8.13 \
     JEMALLOC_NEW=3.6.0 \
     JEMALLOC_STABLE=5.2.1 \
@@ -49,6 +48,7 @@ RUN curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - \
       nodejs \
       optipng \
       jhead \
+      pngquant \
       postgresql-client-${PG_MAJOR} \
       postgresql-contrib-${PG_MAJOR} libpq-dev libreadline-dev \
  && npm install svgo uglify-js -g \
@@ -67,7 +67,6 @@ RUN curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - \
  # Validate install
  && ruby -Eutf-8 -e "v = \`convert -version\`; %w{png tiff jpeg freetype}.each { |f| unless v.include?(f); STDERR.puts('no ' + f +  ' support in imagemagick'); exit(-1); end }" \
  && /tmp/install/pngcrush \
- && /tmp/install/pngquant \
  && addgroup --gid 1000 discourse \
  && adduser --system --uid 1000 --ingroup discourse --shell /bin/bash discourse \
  && cd /home/discourse \
diff --git a/install/pngquant b/install/pngquant
deleted file mode 100755
index a801e26..0000000
--- a/install/pngquant
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-cd /tmp
-git clone -b $PNGQUANT_VERSION --single-branch https://github.com/pornel/pngquant
-cd pngquant
-make && make install
-cd /
-rm -fr /tmp/pngq*
-- 
GitLab