upgrade images

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index b03885bf3ca087aeb23ad76986a1c31c4925e9ea..e55f0ed798175d10cdd97e58d90d8479100c7220 100644 (file)
--- 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.13
+# VERSION:  1.0.14
 
 FROM ubuntu:14.04
 

diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index 185631b037f44a67340c1e41b11ec59de8078f49..c4acaad06170ef7d0c40954ae7913aedfe029567 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.16 git://git.code.sf.net/p/libpng/code $WDIR/libpng
+git clone -b v1.6.19 git://git.code.sf.net/p/libpng/code $WDIR/libpng
 cd $WDIR/libpng
 ./autogen.sh
 ./configure --prefix=$PREFIX

diff --git a/image/build.rb b/image/build.rb
index b1c5ffa511cf3c5ebb2cf0259bf0f04beee28d42..a692a60f1abfe58e76873d08d58902ed556cf161 100644 (file)
--- a/image/build.rb
+++ b/image/build.rb
@@ -2,13 +2,13 @@
 #
 require 'pty'
 
-$version = "1.0.13"
+$version = "1.0.14"
 
-$docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.0.11/docker-squash-linux-amd64-v0.0.11.tar.gz"
+$docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz"
 
-$base_image = "samsaffron/discourse_base:#{$version}"
-$image = "samsaffron/discourse:#{$version}"
-$fast_switch= "samsaffron/discourse_fast_switch:#{$version}"
+$base_image = "discourse/base:#{$version}"
+$image = "discourse/discourse:#{$version}"
+$fast_switch= "discourse/discourse_fast_switch:#{$version}"
 
 if ENV["USER"] != "root"
   STDERR.puts "Build script must be ran as root due to docker-squash"

diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index 727c7cd78d239b317884db001aaa08f90746d86e..4e24525774d96f5f6f2d01522b156398fca786f4 100644 (file)
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,5 +1,5 @@
-# Current version 1.0.13
-FROM samsaffron/discourse_base:1.0.13
+# Current version 1.0.14
+FROM discourse/base:1.0.14
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 

diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile
index 2fc36fddad9989ab8082407a349b33d668a59bd4..dffbfbeff2343c6a4f85ed5c24344130946b7711 100644 (file)
--- a/image/discourse_fast_switch/Dockerfile
+++ b/image/discourse_fast_switch/Dockerfile
@@ -1,6 +1,6 @@
 # Allow to easily switch Ruby version in images that derive off this
 
-FROM samsaffron/discourse:1.0.13
+FROM discourse/discourse:1.0.14
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 

diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
index fed7496b108cc7f131f477eb089ab5090f26db9b..a0a797d0c70ab5f6288e738a0cd198fbcbf2a7b9 100644 (file)
--- a/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@ -1,4 +1,4 @@
-FROM samsaffron/discourse_fast_switch:1.0.12
+FROM discourse/discourse_fast_switch:1.0.14
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"