From: Sam <sam.saffron@gmail.com>
Date: Wed, 8 Jun 2016 00:33:31 +0000 (+1000)
Subject: bump version
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3dc80d6ac9cb1db8140245aec7fa62264ba39a74;p=discourse_docker.git

bump version
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 5a57d2c..f01dfb8 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -1,5 +1,5 @@
 # NAME:     discourse/base
-# VERSION:  1.3.4
+# VERSION:  1.3.5
 
 FROM ubuntu:16.04
 
@@ -8,7 +8,7 @@ ENV PG_VERSION 9.5.3-1.pgdg16.04+1
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN echo "1.3.4" > /VERSION
+RUN echo "1.3.5" > /VERSION
 
 RUN apt-get update && apt-get install -y lsb-release sudo curl
 RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections
diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index 4a62e1e..fbc1f76 100755
--- a/image/base/install-imagemagick
+++ b/image/base/install-imagemagick
@@ -19,7 +19,7 @@ make all && make install
 
 
 # Build and install ImageMagick
-wget -O $WDIR/ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick-6.9.4-7.tar.gz"
+wget -O $WDIR/ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick-6.9.4-8.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
diff --git a/image/build.rb b/image/build.rb
index 22c3b1e..118ded9 100644
--- a/image/build.rb
+++ b/image/build.rb
@@ -2,7 +2,7 @@
 #
 require 'pty'
 
-$version = "1.3.4"
+$version = "1.3.5"
 
 $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz"
 
diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index 483fb3d..f6cf613 100644
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,5 +1,5 @@
-# Current version 1.3.4
-FROM discourse/base:1.3.4
+# Current version 1.3.5
+FROM discourse/base:1.3.5
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
index bce540b..68ef21e 100644
--- a/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@ -1,4 +1,4 @@
-FROM discourse/discourse:1.3.4
+FROM discourse/discourse:1.3.5
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"