dependencies are wrong way around

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 9cfb769ffdce00201cea0b21cf4eda3ed744d257..d820081ac785f04d9ff60066c894d63187124cc9 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -65,6 +65,9 @@ RUN mkdir /jemalloc && cd /jemalloc &&\
       tar -xjf jemalloc-3.6.0.tar.bz2 && cd jemalloc-3.6.0 && ./configure && make &&\
       mv lib/libjemalloc.so.1 /usr/lib && cd / && rm -rf /jemalloc
 
+ADD install-imagemagick /tmp/install-imagemagick
+RUN /tmp/install-imagemagick
+
 ADD install-pngcrush /tmp/install-pngcrush
 RUN /tmp/install-pngcrush
 
@@ -74,9 +77,6 @@ RUN /tmp/install-gifsicle
 ADD install-pngquant /tmp/install-pngquant
 RUN /tmp/install-pngquant
 
-ADD install-imagemagick /tmp/install-imagemagick
-RUN /tmp/install-imagemagick
-
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test &&\
     apt-get update &&\
     apt-get install -y gcc-4.9 &&\

diff --git a/image/base/install-pngquant b/image/base/install-pngquant
index 2ff73d1bfba29f90f8245c44d3693402b1c953a2..0459263685ece8a227a5933b72b6b23b85207385 100755 (executable)
--- a/image/base/install-pngquant
+++ b/image/base/install-pngquant
@@ -1,6 +1,4 @@
 #!/bin/bash
-
-apt-get install -y libpng-dev
 VERSION=2.4.1
 cd /tmp
 wget https://github.com/pornel/pngquant/archive/$VERSION.tar.gz