X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=image%2Fauto_build.rb;h=70415db661e28417310e7ffdd8bfc2509cc68bc1;hb=5716d28f3c6d2a20a9fe2491fce6c131c9951f5c;hp=6349aa2170e485791721f4ac2adadec8089a70d9;hpb=7e364d47b3d666e0209ae4381ab1818b668415fb;p=discourse_docker.git

diff --git a/image/auto_build.rb b/image/auto_build.rb
index 6349aa2..70415db 100644
--- a/image/auto_build.rb
+++ b/image/auto_build.rb
@@ -5,8 +5,9 @@ require 'optparse'
 
 images = {
   base: { name: 'base', tag: "discourse/base:build", squash: true },
-  discourse_test: { name: 'discourse_test', tag: "discourse/discourse_test:build", squash: false},
-  discourse_dev: { name: 'discourse_dev', tag: "discourse/discourse_dev:build", squash: false }
+  discourse_test_build: { name: 'discourse_test', tag: "discourse/discourse_test:build", squash: false},
+  discourse_test_public: { name: 'discourse_test', tag: "discourse/discourse_test:release", squash: true, extra_args: ' --build-arg tag=release '},
+  discourse_dev: { name: 'discourse_dev', tag: "discourse/discourse_dev:build", squash: false },
 }
 
 def run(command)
@@ -26,7 +27,7 @@ def run(command)
 end
 
 def build(image)
-  lines = run("cd #{image[:name]} && docker build . --no-cache --tag #{image[:tag]} #{image[:squash] ? '#--squash' : ''}")
+  lines = run("cd #{image[:name]} && docker build . --no-cache --tag #{image[:tag]} #{image[:squash] ? '--squash' : ''} #{image[:extra_args] ? image[:extra_args] : ''}")
   raise "Error building the image for #{image[:name]}: #{lines[-1]}" if lines[-1] =~ /successfully built/
 end
 
@@ -40,6 +41,5 @@ raise 'Image not found' unless images.include?(image)
 
 puts "Building #{images[image]}"
 dev_deps() if image == :discourse_dev
-run "(cd base && ./download_phantomjs)" if image == :base
 
-build(images[image])
\ No newline at end of file
+build(images[image])