[whimsy] branch master updated: install docker via brew cask

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 415be04  install docker via brew cask
415be04 is described below

commit 415be04b35f1684cea4aa2695128256c0c97a05e
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Nov 29 13:16:59 2019 -0500

    install docker via brew cask
---
 DOCKER.md         |  5 ++++-
 config/setupmymac | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/DOCKER.md b/DOCKER.md
index b7147c5..920e372 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -17,7 +17,10 @@ could be made optional).
 
 Direct link to [docker for
 macOS](https://download.docker.com/mac/stable/Docker.dmg) (this avoids the
-need to login to Docker Hub).
+need to login to Docker Hub), or install via:
+
+    $ brew cask install docker
+    $ open /Applications/Docker.app
 
 A development class machine and a high speed internet connection would
 be in order.  Some things appear to perform well, other things perform
diff --git a/config/setupmymac b/config/setupmymac
index 477658a..c0a218f 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -115,7 +115,9 @@ group = Etc.getgrgid(gid).name
 
 ### Install Homebrew
 
-if Process.uid != 0 and option != :docker
+if Process.uid != 0 and 
+  (option != :docker or not Dir.exist? '/Applications/Docker.app')
+then
   if `which brew`.empty?
     script = 'https://raw.githubusercontent.com/Homebrew/install/master/install'
     color %($ ruby -e "$(curl -fsSL #{script})")
@@ -204,9 +206,16 @@ end
 ### Docker installation
 
 if option == :docker
+  if not Dir.exist? '/Applications/Docker.app'
+    brew 'cask', 'install', 'docker'
+  end
+
+  if `which docker-compose`.empty?
+    run 'open /Applications/Docker.app'
+  end
+
   unless system 'docker info > /dev/null 2>&1'
-    STDERR.puts "Please start docker and run this command again"
-    exit 1
+    run 'open /Applications/Docker.app'
   end
 
   if Process.uid != 0