FEATURE: Build a public test image every week

[discourse_docker.git] / image / auto_build.rb

diff --git a/image/auto_build.rb b/image/auto_build.rb
index c7d0d68710afa6edb17619e381b3b749a5dfc715..40ce7b0af8da887cd2e29d53817deb20935e0f19 100644 (file)
--- a/image/auto_build.rb
+++ b/image/auto_build.rb
@@ -3,6 +3,13 @@
 require 'pty'
 require 'optparse'
 
+images = {
+  base: { name: 'base', tag: "discourse/base:build", squash: true },
+  discourse_test_build: { name: 'discourse_test', tag: "discourse/discourse_test:build", squash: false},
+  discourse_dev: { name: 'discourse_dev', tag: "discourse/discourse_dev:build", squash: false },
+  discourse_test_public: { name: 'discourse_test', tag: "discourse/discourse_test:release", squash: true, extra_args: ' --build-arg tag=release '}
+}
+
 def run(command)
   lines = []
   PTY.spawn(command) do |stdin, stdout, pid|
@@ -20,9 +27,8 @@ def run(command)
 end
 
 def build(image)
-  sucess = false
-  lines = run("cd #{image[:name]} && docker build . --tag #{image[:tag]} #{image[:squash] ? '--squash' : ''}")
-  sucess = true if lines[-1] =~ 'successfully built'
+  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
 
 def dev_deps()
@@ -30,31 +36,11 @@ def dev_deps()
   run("cp ../templates/redis.template.yml discourse_dev/redis.template.yml")
 end
 
-options = {}
-OptionParser.new do |parser|
-  parser.on("-i", "--image image",
-            "Build the image. No parameter means [base discourse discourse_test].") do |i|
-    options[:image] = [i.to_sym]
-  end
-end.parse!
-
-DEFAULT_IMAGES = [:base, :discourse, :discourse_test, :discourse_dev, :discourse_bench]
+image = ARGV[0].intern
+raise 'Image not found' unless images.include?(image)
 
-todo = options[:image] || DEFAULT_IMAGES
-version = 'release'
+puts "Building #{images[image]}"
+dev_deps() if image == :discourse_dev
+run "(cd base && ./download_phantomjs)" if image == :base
 
-images = {
-  base: { name: 'base', tag: "discourse/base:#{version}", squash: true },
-  discourse_test: { name: 'discourse_test', tag: "discourse/discourse_test:#{version}", squash: false},
-  discourse_dev: { name: 'discourse_dev', tag: "discourse/discourse_dev:#{version}", squash: false }
-}
-
-todo.each do |image|
-  puts images[image]
-  bump(images[image][:name], options[:version]) if options[:version]
-
-  dev_deps() if image == :discourse_dev
-  run "(cd base && ./download_phantomjs)" if image == :base
-
-  build(images[image])
-end
+build(images[image])
\ No newline at end of file