From 0dbab775b046fa0325c033da4190bb087b0ffefb Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Wed, 28 Dec 2016 16:29:13 -0200 Subject: [PATCH] Bumps image version to 1.3.10 --- 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 901a69a..a8d9fe7 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -1,5 +1,5 @@ # NAME: discourse/base -# VERSION: 1.3.9 +# VERSION: 1.3.10 FROM ubuntu:16.04 ENV PG_MAJOR 9.5 diff --git a/image/base/VERSION b/image/base/VERSION index d4c4950..0c00f61 100644 --- a/image/base/VERSION +++ b/image/base/VERSION @@ -1 +1 @@ -1.3.9 +1.3.10 diff --git a/image/build.rb b/image/build.rb index d27857d..6e45536 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.9' +version = options[:version] || '1.3.10' 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 bd40ae6..898b6a9 100644 --- a/image/discourse/Dockerfile +++ b/image/discourse/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse -# VERSION: 1.3.9 -FROM discourse/base:1.3.9 +# VERSION: 1.3.10 +FROM discourse/base:1.3.10 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_bench/Dockerfile b/image/discourse_bench/Dockerfile index 16c000f..3df40e2 100644 --- a/image/discourse_bench/Dockerfile +++ b/image/discourse_bench/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse_bench -# VERSION: 1.3.9 -FROM discourse/discourse_test:1.3.9 +# VERSION: 1.3.10 +FROM discourse/discourse_test:1.3.10 MAINTAINER Gerhard Schlager diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile index 7dba165..99d2122 100644 --- a/image/discourse_dev/Dockerfile +++ b/image/discourse_dev/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse_dev -# VERSION: 1.3.9 -FROM discourse/base:1.3.9 +# VERSION: 1.3.10 +FROM discourse/base:1.3.10 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile index d717446..933b625 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.9 +# VERSION: 1.3.10 # Allow to easily switch Ruby version in images that derive off this -FROM discourse/base:1.3.9 +FROM discourse/base:1.3.10 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index af59cd5..e709573 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -1,6 +1,6 @@ # NAME: discourse/discourse_test -# VERSION: 1.3.9 -FROM discourse/discourse:1.3.9 +# VERSION: 1.3.10 +FROM discourse/discourse:1.3.10 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/launcher b/launcher index e7ae6b6..f2658ad 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.9 +image=discourse/discourse:1.3.10 docker_path=`which docker.io || which docker` git_path=`which git` -- 2.25.1