From: Régis Hanol <regis@hanol.fr>
Date: Fri, 4 Jul 2014 11:27:44 +0000 (+0200)
Subject: FEATURE: add pngout to the base images
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5d6f9ed2088890ab07d867349b1531643bee348e;p=discourse_docker.git

FEATURE: add pngout to the base images
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index b021438..f76927e 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -51,10 +51,16 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
     rm -f /etc/apt/apt.conf.d/40proxy &&\
     locale-gen en_US &&
     wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-    tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-    rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-    cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
-    rm -fr phantomjs-1.9.7-linux-x86_64
+      tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
+      rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
+      cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
+      rm -fr phantomjs-1.9.7-linux-x86_64 &&\
+    wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz &&\
+      tar -xvf pngout-20130221-linux.tar.gz &&\
+      rm pngout-20130221-linux.tar.gz &&\
+      cp pngout-20130221-linux/x86_64/pngout /bin/pngout &&\
+      rm -rf pngout-20130221-linux
+
 
 ADD runit-1 /etc/runit/1
 ADD runit-1.d-cleanup-pids /etc/runit/1.d/cleanup-pids
diff --git a/image/base_21/Dockerfile b/image/base_21/Dockerfile
index c23b2dc..4306b5d 100644
--- a/image/base_21/Dockerfile
+++ b/image/base_21/Dockerfile
@@ -57,10 +57,15 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
     locale-gen en_US &&\
     mkdir -p /etc/runit/1.d &&\
     wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-    tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-    rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-    cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
-    rm -fr phantomjs-1.9.7-linux-x86_64
+      tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
+      rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
+      cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
+      rm -fr phantomjs-1.9.7-linux-x86_64 &&\
+    wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz &&\
+      tar -xvf pngout-20130221-linux.tar.gz &&\
+      rm pngout-20130221-linux.tar.gz &&\
+      cp pngout-20130221-linux/x86_64/pngout /bin/pngout &&\
+      rm -rf pngout-20130221-linux
 
 ADD runit-1 /etc/runit/1
 ADD runit-1.d-cleanup-pids /etc/runit/1.d/cleanup-pids