diff --git a/image/base/Dockerfile b/image/base/Dockerfile index b03885b..e55f0ed 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.13 +# VERSION: 1.0.14 FROM ubuntu:14.04 diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick index 185631b..c4acaad 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.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 b1c5ffa..a692a60 100644 --- 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 727c7cd..4e24525 100644 --- 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 2fc36fd..dffbfbe 100644 --- 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 fed7496..a0a797d 100644 --- 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"