From: Sam <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2015 22:06:04 +0000 (+1100)
Subject: new version of ruby new imagemagick
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=429b46bb625b3c9d8ba491939ed9877101dadf47;p=discourse_docker.git

new version of ruby new imagemagick
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index c60bc12..657634a 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -2,7 +2,7 @@
 # When new LTS ships we can upgrade
 
 # NAME:     discourse_base
-# VERSION:  1.0.8
+# VERSION:  1.0.9
 
 FROM ubuntu:14.04
 
@@ -28,7 +28,7 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
                        libxslt-dev libcurl4-openssl-dev \
                        libssl-dev libyaml-dev libtool \
                        libxml2-dev gawk \
-                       pngcrush imagemagick gifsicle \
+                       pngcrush gifsicle \
                        postgresql-9.3 postgresql-client-9.3 \
                        postgresql-contrib-9.3 libpq-dev libreadline-dev \
                        nginx language-pack-en sudo cron anacron \
@@ -61,6 +61,9 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
     apt-get install -y nodejs &&\
     npm install uglify-js -g
 
+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 &&\
@@ -68,7 +71,7 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test &&\
     echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
     mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
     cd /src/ruby-build && ./install.sh &&\
-    cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p594 /usr/local &&\
+    cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p643 /usr/local &&\
     gem update --system &&\
     gem install bundler &&\
     rm -rf /usr/local/share/ri/2.0.0/system &&\
diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
new file mode 100755
index 0000000..8ff15e0
--- /dev/null
+++ b/image/base/install-imagemagick
@@ -0,0 +1,47 @@
+#!/bin/bash
+set -o errexit
+
+# Install build deps
+apt-get -y -q remove imagemagick
+apt-get -y -q install autoconf libbz2-dev libjpeg-dev libtiff-dev libfreetype6-dev
+
+PREFIX=/usr/local
+WDIR=/tmp/imagemagick
+mkdir -p $WDIR
+
+# Build and install libpng
+git clone -b v1.6.16 git://git.code.sf.net/p/libpng/code $WDIR/libpng
+cd $WDIR/libpng
+./autogen.sh
+./configure --prefix=$PREFIX
+make all && make install
+
+# Build and install ImageMagick
+wget -O $WDIR/ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick.tar.gz"
+IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick-*/configure" |cut -d/ -f1)
+tar zxf $WDIR/ImageMagick.tar.gz -C $WDIR
+cd $IMDIR
+LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./configure \
+          --prefix=$PREFIX \
+          --enable-static \
+          --enable-bounds-checking \
+          --enable-hdri \
+          --enable-hugepages \
+          --with-threads \
+          --with-modules \
+          --with-quantum-depth=16 \
+          --without-magick-plus-plus \
+          --with-bzlib \
+          --with-zlib \
+          --without-autotrace \
+          --with-freetype \
+          --with-jpeg \
+          --without-lcms \
+          --with-lzma \
+          --with-png \
+          --with-tiff
+make all && make install
+
+cd $HOME
+rm -rf $WDIR
+ldconfig
diff --git a/image/base_22/Dockerfile b/image/base_22/Dockerfile
index 823a92a..6c8844b 100644
--- a/image/base_22/Dockerfile
+++ b/image/base_22/Dockerfile
@@ -2,7 +2,7 @@
 # When new LTS ships we can upgrade
 
 # VERSION 0.1.0
-FROM samsaffron/discourse_base:1.0.7
+FROM samsaffron/discourse_base:1.0.9
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
diff --git a/image/build.rb b/image/build.rb
index da9b4ce..82ecfc6 100644
--- a/image/build.rb
+++ b/image/build.rb
@@ -2,7 +2,7 @@
 #
 require 'pty'
 
-$version = "1.0.8"
+$version = "1.0.9"
 
 $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.0.11/docker-squash-linux-amd64-v0.0.11.tar.gz"
 
diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index e084ccb..3962f36 100644
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,5 +1,5 @@
-# Current version 1.0.8
-FROM samsaffron/discourse_base:1.0.8
+# Current version 1.0.9
+FROM samsaffron/discourse_base:1.0.9
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"