Bumps image version to 1.3.10

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 901a69a3c16a57742fa7637a0adeb4c8a24c4e6a..a8d9fe740a7a952843c8bafde6a3d3a5c43df7be 100644 (file)
--- 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 d4c4950a37c9ccd904d49625d02288dff4ad8feb..0c00f610817561b72c3f217568c99c1e0e0bd008 100644 (file)
--- 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 d27857d14d9420f0d57e28acc2363bbf083be329..6e4553654dc3a79f5ed6e30342c67be4e9a64103 100644 (file)
--- 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 bd40ae6e79b4dbffadfc0f5af44b68a9cf9ab441..898b6a9e99ec49e0a4d5a35c7c08af0365629ac3 100644 (file)
--- 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 16c000f17419079d7ac5d5159040d63b44850f75..3df40e2e067f140824853104205e09976e060935 100644 (file)
--- 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 <mail@gerhard-schlager.at>
 

diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile
index 7dba165f3f6ece45a9b9ded2844bea6626bc6d55..99d2122536348f806bf0ecc63f3f8a3a129a076e 100644 (file)
--- 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 d717446077445c7ea4ac1abf8de667fd9e840c73..933b6252033b9be338022f42f47fe52c9607ca74 100644 (file)
--- 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 af59cd5ef39ebbf437e84552de160d66f1c563d3..e709573057a2fdf7494528cc6a1953c6333f6e6d 100644 (file)
--- 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 e7ae6b635467fad44176ab525b446c5ed5294b2e..f2658ad0d40dd30afadb24020c2153b0506389e9 100755 (executable)
--- 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`