From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 28 Oct 2016 19:31:06 +0000 (-0200)
Subject: Install docker-squash in the PATH
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b69298145f4ef5fbdca3edecdb353ede2fc501ba;p=discourse_docker.git

Install docker-squash in the PATH
---

diff --git a/image/build.rb b/image/build.rb
index 7f7cd0b..a712eb0 100644
--- a/image/build.rb
+++ b/image/build.rb
@@ -22,7 +22,7 @@ end
 def ensure_docker_squash
   docker_squash = "https://github.com/goldmann/docker-squash/archive/master.zip"
   run ("apt install python-pip")
-  run ("pip install --user '#{docker_squash}' --upgrade")
+  run ("pip install '#{docker_squash}' --upgrade")
 end
 
 
@@ -94,8 +94,8 @@ 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'
+  dev_deps() if image == :discourse_dev
+  run "(cd base && ./download_phantomjs)" if image == :base
 
   build(images[image])
 end