Merge branch 'upgrade_everyone_to_postgres_9.5' of https://github.com/tgxworld/discou...

[discourse_docker.git] / image / build.rb

diff --git a/image/build.rb b/image/build.rb
index ff329e9993a8fa2a0dd40507cc7492faa71301a0..2daeaec314cafe9e41e1be39bd3284de804fb26b 100644 (file)
--- a/image/build.rb
+++ b/image/build.rb
@@ -2,12 +2,14 @@
 #
 require 'pty'
 
-$version = "1.0.8"
+$version = "1.0.17"
 
-$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}"
+$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"
   STDERR.puts "Build script must be ran as root due to docker-squash"
@@ -34,7 +36,7 @@ def ensure_docker_squash
   return if File.exist?("docker-squash")
   run ("wget #{$docker_squash}")
   run ("tar -xzvf *.tar.gz")
-  run ("rm docker-squash-linux*")
+  run ("rm -f docker-squash-linux*")
 end
 
 ensure_docker_squash
@@ -48,5 +50,5 @@ end
 
 build("base",$base_image,true)
 build("discourse",$image,false)
-
-
+build("discourse_fast_switch",$fast_switch,false)
+build("discourse_test",$test,false)