From: Sam <sam.saffron@gmail.com>
Date: Thu, 1 Sep 2016 00:18:32 +0000 (+1000)
Subject: base image update
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=089e57a231bd1683a8c9b9a4c03ddf2b24f9eeac;p=discourse_docker.git

base image update
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 16e0fbe..37c085b 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -1,10 +1,10 @@
 # NAME:     discourse/base
-# VERSION:  1.3.5
+# VERSION:  1.3.6
 
 FROM ubuntu:16.04
 
 ENV PG_MAJOR 9.5
-ENV PG_VERSION 9.5.3-1.pgdg16.04+1
+ENV PG_VERSION 9.5.4-1.pgdg16.04+1
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
@@ -120,4 +120,4 @@ ADD boot /sbin/boot
 
 ADD cron /etc/service/cron/run
 ADD rsyslog /etc/service/rsyslog/run
-ADD cron.d-anacron /etc/cron.d/anacron
+ADD cron.d_anacron /etc/cron.d/anacron
diff --git a/image/base/install-gifsicle b/image/base/install-gifsicle
index bfee12a..a16f267 100755
--- a/image/base/install-gifsicle
+++ b/image/base/install-gifsicle
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-VERSION=1.87
+VERSION=1.88
 cd /tmp
 curl -O http://www.lcdf.org/gifsicle/gifsicle-$VERSION.tar.gz
 tar zxf gifsicle-$VERSION.tar.gz
diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index fbc1f76..4288203 100755
--- a/image/base/install-imagemagick
+++ b/image/base/install-imagemagick
@@ -10,7 +10,7 @@ WDIR=/tmp/imagemagick
 mkdir -p $WDIR
 
 # Build and install libpng
-git clone -b v1.6.21 git://git.code.sf.net/p/libpng/code $WDIR/libpng
+git clone -b v1.6.24 git://git.code.sf.net/p/libpng/code $WDIR/libpng
 cd $WDIR/libpng
 ./autogen.sh
 ./configure --prefix=$PREFIX
@@ -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-8.tar.gz"
+wget -O $WDIR/ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick-6.9.5-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/base/install-pngcrush b/image/base/install-pngcrush
index 8c68666..75553da 100755
--- a/image/base/install-pngcrush
+++ b/image/base/install-pngcrush
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
-PNGCRUSH_VERSION=1.7.92
+PNGCRUSH_VERSION=1.8.5
 cd /tmp
-wget http://iweb.dl.sourceforge.net/project/pmt/pngcrush/$PNGCRUSH_VERSION/pngcrush-$PNGCRUSH_VERSION.tar.gz
+wget https://sourceforge.net/projects/pmt/files/pngcrush/$PNGCRUSH_VERSION/pngcrush-$PNGCRUSH_VERSION.tar.gz/download -O pngcrush-$PNGCRUSH_VERSION.tar.gz
 tar zxf pngcrush-$PNGCRUSH_VERSION.tar.gz
 cd pngcrush-$PNGCRUSH_VERSION
 make && cp -f pngcrush /usr/local/bin
diff --git a/image/build.rb b/image/build.rb
index 118ded9..44a9fb6 100644
--- a/image/build.rb
+++ b/image/build.rb
@@ -2,7 +2,7 @@
 #
 require 'pty'
 
-$version = "1.3.5"
+$version = "1.3.6"
 
 $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 f6cf613..1362b9c 100644
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,5 +1,5 @@
-# Current version 1.3.5
-FROM discourse/base:1.3.5
+# Current version 1.3.6
+FROM discourse/base:1.3.6
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
index 68ef21e..1f149fe 100644
--- a/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@ -1,4 +1,4 @@
-FROM discourse/discourse:1.3.5
+FROM discourse/discourse:1.3.6
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"