From 8382a64b49b2e176436315b92512becf512a6bbe Mon Sep 17 00:00:00 2001
From: whitestar <whitestar@users.osdn.me>
Date: Sun, 6 May 2018 12:24:02 +0900
Subject: [PATCH] fixes utility scripts.

---
 cookbooks/docker-grid/CHANGELOG.md                                  | 4 ++++
 cookbooks/docker-grid/concourse.yml                                 | 6 +++---
 .../templates/default/usr/local/bin/docker_containers_cleanup       | 5 ++++-
 .../templates/default/usr/local/bin/docker_images_cleanup           | 5 ++++-
 .../templates/default/usr/local/bin/docker_volumes_cleanup          | 5 ++++-
 cookbooks/docker-grid/version                                       | 2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index be45bfe..1c8a977 100644
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # docker-grid CHANGELOG
 
+0.5.9
+-----
+- fixes utility scripts.
+
 0.5.8
 -----
 - improves utility scripts.
diff --git a/cookbooks/docker-grid/concourse.yml b/cookbooks/docker-grid/concourse.yml
index c9aab82..2a43c1b 100644
--- a/cookbooks/docker-grid/concourse.yml
+++ b/cookbooks/docker-grid/concourse.yml
@@ -1,5 +1,5 @@
 ---
-# $ fly -t target sp -p docker-grid-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml
+# $ fly -t $CC_TARGET sp -p docker-grid-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml
 resources:
 - name: src-git
   type: git
@@ -21,7 +21,7 @@ resources:
     ca_certs:
     - domain: ((registry-mirror-domain))  # e.g. registry.docker.example.com:5000
       cert: ((docker-reg-ca-cert))
-  check_every: 12h  # default: 1m
+  check_every: 6h  # default: 1m
 
 jobs:
 - name: test-cookbook
@@ -97,4 +97,4 @@ jobs:
       tag_prefix: ((cookbook-name))-
       tag: src-git/cookbooks/((cookbook-name))/version
       only_tag: true
-      annotate: ../src-git/cookbooks/((cookbook-name))/version
+      annotate: src-git/cookbooks/((cookbook-name))/version
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 aec92be..43610e7 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
@@ -8,4 +8,7 @@ if id $(whoami) | grep docker > /dev/null 2>&1; then
 fi 
 [ `whoami` = 'root' ] && sudo=''
 
-$sudo docker ps -q -f status=exited -f status=dead | awk '{print $1}' | xargs --no-run-if-empty docker rm
+if ! tty -s; then
+  echo `date '+%Y-%m-%d %H:%M:%S %z'`' Removing exited and dead containers ...'
+fi
+$sudo docker ps -q -f status=exited -f status=dead | awk '{print $1}' | $sudo 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 5872258..e7852aa 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
@@ -8,4 +8,7 @@ if id $(whoami) | grep docker > /dev/null 2>&1; then
 fi 
 [ `whoami` = 'root' ] && sudo=''
 
-$sudo docker images | awk '$2=="<none>" {print $3}' | xargs --no-run-if-empty docker rmi
+if ! tty -s; then
+  echo `date '+%Y-%m-%d %H:%M:%S %z'`' Removing untagged images ...'
+fi
+$sudo docker images | awk '$2=="<none>" {print $3}' | $sudo 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 80e5f2c..8a4adfc 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
@@ -8,4 +8,7 @@ if id $(whoami) | grep docker > /dev/null 2>&1; then
 fi 
 [ `whoami` = 'root' ] && sudo=''
 
-$sudo docker volume ls -qf dangling=true | xargs --no-run-if-empty docker volume rm
+if ! tty -s; then
+  echo `date '+%Y-%m-%d %H:%M:%S %z'`' Removing dangling volumes ...'
+fi
+$sudo docker volume ls -qf dangling=true | $sudo xargs --no-run-if-empty docker volume rm
diff --git a/cookbooks/docker-grid/version b/cookbooks/docker-grid/version
index 659914a..416bfb0 100644
--- a/cookbooks/docker-grid/version
+++ b/cookbooks/docker-grid/version
@@ -1 +1 @@
-0.5.8
+0.5.9
-- 
2.11.0