base image update

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 16e0fbe79ea3b5f1ec7e20a1fc5cc9bd890f2755..37c085b3ef558e8a243ab551030036553efafa37 100644 (file)
--- 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 bfee12a883c3617f723cc44b9c8614275f459e95..a16f267d946cf201d3a0b303762c5891a0c74724 100755 (executable)
--- 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 fbc1f767b8d116439f8eafe277c253224379f4e0..4288203bf854796624a0dd3e685080bd3659c8e1 100755 (executable)
--- 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 8c68666d774440e168fe3eb520d1f807558516cf..75553dafea11d8da4177d2fcf2025074c5e4df1f 100755 (executable)
--- 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 118ded95fcf358b10ce2408d46013f8249dff0d4..44a9fb6d1c33981567718f819d29342a4074997b 100644 (file)
--- 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 f6cf613296d8b8961e05ec3fd70348b7690bf4f6..1362b9c77a7fa321857dce53f260e847f86965bc 100644 (file)
--- 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 68ef21ed9561da9711ad76b4778daa9cafed5eee..1f149fe773b0b8f045ab343b95d9e4581aaa3d67 100644 (file)
--- 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"