From 8c9edf520c9bca1faeca85ed3e16d43842ca6b95 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 29 May 2015 15:02:49 +1000 Subject: [PATCH] dependencies are wrong way around --- image/base/Dockerfile | 6 +++--- image/base/install-pngquant | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 9cfb769..d820081 100644 --- 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 2ff73d1..0459263 100755 --- 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 -- 2.25.1