From 40341f470d6cb07287a7819a4b5b6e9710364e32 Mon Sep 17 00:00:00 2001
From: whitestar <whitestar@users.osdn.me>
Date: Sun, 3 Dec 2017 16:41:19 +0900
Subject: [PATCH] improves utility scripts.

---
 cookbooks/docker-grid/CHANGELOG.md                       |  4 ++++
 cookbooks/docker-grid/recipes/dind-compose.rb            | 16 +++++++++-------
 cookbooks/docker-grid/recipes/registry.rb                | 16 +++++++++-------
 .../default/usr/local/bin/docker_containers_cleanup      | 14 +++++++++++---
 .../default/usr/local/bin/docker_images_cleanup          | 14 +++++++++++---
 .../default/usr/local/bin/docker_volumes_cleanup         | 14 +++++++++++---
 cookbooks/docker-grid/version                            |  2 +-
 7 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index de98f11..be45bfe 100644
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # docker-grid CHANGELOG
 
+0.5.8
+-----
+- improves utility scripts.
+
 0.5.7
 -----
 - refactoring.
diff --git a/cookbooks/docker-grid/recipes/dind-compose.rb b/cookbooks/docker-grid/recipes/dind-compose.rb
index 43b5f3a..4be1f73 100644
--- a/cookbooks/docker-grid/recipes/dind-compose.rb
+++ b/cookbooks/docker-grid/recipes/dind-compose.rb
@@ -73,12 +73,14 @@ override_config_srvs['dind']['volumes'] = vols unless vols.empty?
   end
 }
 
-log <<-"EOM"
+log 'dind-compose post install message' do
+  message <<-"EOM"
 Note: You must execute the following command manually.
-  See #{doc_url}
-  * Start:
-    $ cd #{app_dir}
-    $ docker-compose up -d
-  * Stop
-    $ docker-compose down
+    See #{doc_url}
+    * Start:
+      $ cd #{app_dir}
+      $ docker-compose up -d
+    * Stop
+      $ docker-compose down
 EOM
+end
diff --git a/cookbooks/docker-grid/recipes/registry.rb b/cookbooks/docker-grid/recipes/registry.rb
index 6f30712..0698c88 100644
--- a/cookbooks/docker-grid/recipes/registry.rb
+++ b/cookbooks/docker-grid/recipes/registry.rb
@@ -102,12 +102,14 @@ node.override['docker-grid']['registry']['docker-compose']['config'] = \
   end
 }
 
-log <<-"EOM"
+log 'registry-docker-compose post install message' do
+  message <<-"EOM"
 Note: You must execute the following command manually.
-  See #{doc_url}
-  * Start:
-    $ cd #{app_dir}
-    $ docker-compose up -d
-  * Stop
-    $ docker-compose down
+    See #{doc_url}
+    * Start:
+      $ cd #{app_dir}
+      $ docker-compose up -d
+    * Stop
+      $ docker-compose down
 EOM
+end
diff --git a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup
index fd98017..aec92be 100644
--- a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup
+++ b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup
@@ -1,3 +1,11 @@
-#!/bin/sh
-
-docker ps -q -f status=exited -f status=dead | awk '{print $1}' | xargs --no-run-if-empty docker rm
+#!/bin/sh
+
+PATH=.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+
+sudo='sudo'
+if id $(whoami) | grep docker > /dev/null 2>&1; then
+  sudo=''
+fi 
+[ `whoami` = 'root' ] && sudo=''
+
+$sudo docker ps -q -f status=exited -f status=dead | awk '{print $1}' | xargs --no-run-if-empty docker rm
diff --git a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_images_cleanup b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_images_cleanup
index 2e13cef..5872258 100644
--- a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_images_cleanup
+++ b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_images_cleanup
@@ -1,3 +1,11 @@
-#!/bin/sh
-
-docker images | awk '$2=="<none>" {print $3}' | xargs --no-run-if-empty docker rmi
+#!/bin/sh
+
+PATH=.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+
+sudo='sudo'
+if id $(whoami) | grep docker > /dev/null 2>&1; then
+  sudo=''
+fi 
+[ `whoami` = 'root' ] && sudo=''
+
+$sudo docker images | awk '$2=="<none>" {print $3}' | xargs --no-run-if-empty docker rmi
diff --git a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_volumes_cleanup b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_volumes_cleanup
index 2ce3871..80e5f2c 100644
--- a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_volumes_cleanup
+++ b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_volumes_cleanup
@@ -1,3 +1,11 @@
-#!/bin/sh
-
-docker volume ls -qf dangling=true | xargs --no-run-if-empty docker volume rm
+#!/bin/sh
+
+PATH=.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+
+sudo='sudo'
+if id $(whoami) | grep docker > /dev/null 2>&1; then
+  sudo=''
+fi 
+[ `whoami` = 'root' ] && sudo=''
+
+$sudo docker volume ls -qf dangling=true | xargs --no-run-if-empty docker volume rm
diff --git a/cookbooks/docker-grid/version b/cookbooks/docker-grid/version
index d3532a1..659914a 100644
--- a/cookbooks/docker-grid/version
+++ b/cookbooks/docker-grid/version
@@ -1 +1 @@
-0.5.7
+0.5.8
-- 
2.11.0