From 5369fa7aca8c3a9dbaaa40783a41233a408cbf5a Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Tue, 6 Dec 2016 22:52:33 -0200 Subject: [PATCH] Bumps version to 1.3.9 --- image/base/Dockerfile | 2 +- image/base/VERSION | 2 +- image/build.rb | 2 +- image/discourse/Dockerfile | 4 ++-- image/discourse_bench/Dockerfile | 4 ++-- image/discourse_dev/Dockerfile | 4 ++-- image/discourse_fast_switch/Dockerfile | 4 ++-- image/discourse_test/Dockerfile | 4 ++-- launcher | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index c0b212c..b349de1 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -1,5 +1,5 @@ # NAME: discourse/base -# VERSION: 1.3.8 +# VERSION: 1.3.9 FROM ubuntu:16.04 ENV PG_MAJOR 9.5 diff --git a/image/base/VERSION b/image/base/VERSION index e05cb33..d4c4950 100644 --- a/image/base/VERSION +++ b/image/base/VERSION @@ -1 +1 @@ -1.3.8 +1.3.9 diff --git a/image/build.rb b/image/build.rb index 33f5872..d27857d 100644 --- a/image/build.rb +++ b/image/build.rb @@ -73,7 +73,7 @@ end.parse! DEFAULT_IMAGES = %i[base discourse discourse_test discourse_dev discourse_bench] todo = options[:image] || DEFAULT_IMAGES -version = options[:version] || '1.3.8' +version = options[:version] || '1.3.9' 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 5d588f6..bd40ae6 100644 --- a/image/discourse/Dockerfile +++ b/image/discourse/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse -# VERSION: 1.3.8 -FROM discourse/base:1.3.8 +# VERSION: 1.3.9 +FROM discourse/base:1.3.9 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_bench/Dockerfile b/image/discourse_bench/Dockerfile index 38a9669..16c000f 100644 --- a/image/discourse_bench/Dockerfile +++ b/image/discourse_bench/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse_bench -# VERSION: 1.3.8 -FROM discourse/discourse_test:1.3.8 +# VERSION: 1.3.9 +FROM discourse/discourse_test:1.3.9 MAINTAINER Gerhard Schlager diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile index 69fa17d..071f894 100644 --- a/image/discourse_dev/Dockerfile +++ b/image/discourse_dev/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse_dev -# VERSION: 1.3.8 -FROM discourse/base:1.3.8 +# VERSION: 1.3.9 +FROM discourse/base:1.3.9 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile index d361403..d717446 100644 --- a/image/discourse_fast_switch/Dockerfile +++ b/image/discourse_fast_switch/Dockerfile @@ -1,8 +1,8 @@ # NAME: discourse/discourse_fast_switch -# VERSION: 1.3.8 +# VERSION: 1.3.9 # Allow to easily switch Ruby version in images that derive off this -FROM discourse/base:1.3.8 +FROM discourse/base:1.3.9 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index 173e133..af59cd5 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse_test -# VERSION: 1.3.8 -FROM discourse/discourse:1.3.8 +# VERSION: 1.3.9 +FROM discourse/discourse:1.3.9 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/launcher b/launcher index c152fe0..c58d1db 100755 --- a/launcher +++ b/launcher @@ -64,7 +64,7 @@ git_rec_version='1.8.0' config_file=containers/"$config".yml cidbootstrap=cids/"$config"_bootstrap.cid local_discourse=local_discourse -image=discourse/discourse:1.3.8 +image=discourse/discourse:1.3.9 docker_path=`which docker.io || which docker` git_path=`which git` -- 2.25.1