bump version in a few spots

diff --git a/image/build.rb b/image/build.rb
index 2daeaec314cafe9e41e1be39bd3284de804fb26b..8426815ed411aa37aa641470ec1e356366beb6ca 100644 (file)
--- a/image/build.rb
+++ b/image/build.rb
@@ -2,13 +2,12 @@
 #
 require 'pty'
 
-$version = "1.0.17"
+$version = "1.3.0"
 
 $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz"
 
 $base_image = "discourse/base:#{$version}"
 $image = "discourse/discourse:#{$version}"
-$fast_switch= "discourse/discourse_fast_switch:#{$version}"
 $test = "discourse/discourse_test:#{$version}"
 
 if ENV["USER"] != "root"
@@ -50,5 +49,4 @@ end
 
 build("base",$base_image,true)
 build("discourse",$image,false)
-build("discourse_fast_switch",$fast_switch,false)
 build("discourse_test",$test,false)

diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
index 278ef0efe9f029f05feb118980eaef03501ab12e..d341f6663acb213621d4a51fc26798aa34a80c0b 100644 (file)
--- a/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@ -1,9 +1,8 @@
-FROM discourse/discourse_fast_switch:1.0.18
+FROM discourse/discourse:1.3.0
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN use_23 &&\
-      gem update bundler &&\
+RUN gem update bundler &&\
       cd /var/www/discourse &&\
       chown -R discourse . &&\
       rm -fr .bundle &&\