From da9cd4f6928a36af77e98d0e44103d256d12bad5 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 22 Nov 2021 10:16:35 -0700
Subject: [PATCH] DEV: Swap out optipng with oxipng (#15013)

* DEV: Swap out optipng with oxipng

The oxipng binary has been added to our base docker image here:

https://github.com/discourse/discourse_docker/commit/244c9cb110df44eb9d846a24b5572471a2687071

oxipng is a rust replacement for optipng that provides increased
performance and multi-threading. Checkout
https://github.com/shssoichiro/oxipng for more info.

* add instructions for installing oxipng
---
 docs/DEVELOPER-ADVANCED.md     | 6 ++++++
 docs/DEVELOPMENT-OSX-NATIVE.md | 2 +-
 lib/file_helper.rb             | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index 6ad004b1aa..a4dac6c68b 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -14,6 +14,12 @@ To get your Ubuntu 16.04 or 18.04 LTS install up and running to develop Discours
     sudo apt-get -yqq update
     sudo apt-get -yqq install software-properties-common vim curl expect debconf-utils git-core build-essential zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libreadline6-dev libpcre3 libpcre3-dev imagemagick redis-server advancecomp jhead jpegoptim libjpeg-turbo-progs optipng pngcrush pngquant gnupg2
 
+    # oxipng
+    mkdir /tmp/oxipng-install && cd /tmp/oxipng-install
+    wget https://github.com/shssoichiro/oxipng/releases/download/v5.0.1/oxipng-5.0.1-x86_64-unknown-linux-musl.tar.gz
+    tar -xzf oxipng-5.0.1-x86_64-unknown-linux-musl.tar.gz && cd oxipng-5.0.1-x86_64-unknown-linux-musl
+    cp oxipng /usr/local/bin
+
     # Ruby
     curl -sSL https://rvm.io/mpapis.asc | gpg2 --import -
     curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import -
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index c8a0d51b9e..2ef9f10695 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -225,7 +225,7 @@ In addition to ImageMagick we also need to install some other image related
 software:
 
 ```sh
-brew install jpegoptim optipng jhead
+brew install jpegoptim optipng oxipng jhead
 npm install -g svgo
 ```
 
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index acdf958f36..9c90e58adb 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -116,7 +116,8 @@ class FileHelper
         timeout: 15,
         skip_missing_workers: true,
         # PNG
-        optipng: { level: 2, strip: strip_image_metadata },
+        oxipng: { level: 3, strip: strip_image_metadata },
+        optipng: false,
         advpng: false,
         pngcrush: false,
         pngout: false,
@@ -128,7 +129,6 @@ class FileHelper
         # Skip looking for gifsicle, svgo binaries
         gifsicle: false,
         svgo: false,
-        oxipng: false
       )
     end
   end