tcwg-cleanup-stale-containers: Rework container time calculation.

Thanks, Charles!

Change-Id: Iba7f6ba6ad5f51eaf244c38ad68f37150d080a4b

1 files changed, 7 insertions, 8 deletions

diff --git a/tcwg-cleanup-stale-containers.sh b/tcwg-cleanup-stale-containers.sh
index 6c28b8dc..ce879cb1 100755
--- a/tcwg-cleanup-stale-containers.sh
+++ b/tcwg-cleanup-stale-containers.sh
@@ -63,16 +63,15 @@ do_cleanup_containers ()
     echo "Container report before:"
     $DOCKER ps $docker_ps_opts
 
-    rm_containers=()
-    for container in $($DOCKER ps --format "{{.ID}} {{.RunningFor}}" $docker_ps_opts | grep "hour\|day" | cut -d" " -f 1); do
-	container_days="$($DOCKER ps --format "{{.ID}} {{.RunningFor}}" $docker_ps_opts | grep "$container [0-9]\+ day" | cut -d" " -f 2)"
-	if [ x"$container_days" = x"" ]; then container_days="0"; fi
+    local -a rm_containers=()
+    local curdate=$(date +%s)
+    for container in $(docker ps $docker_ps_opts --format "{{.ID}}"); do
+	local container_date container_seconds
 
-	container_hours="$($DOCKER ps --format "{{.ID}} {{.RunningFor}}" $docker_ps_opts | grep "$container [0-9]\+ hour" | cut -d" " -f 2)"
-	if [ x"$container_hours" = x"" ]; then container_hours="0"; fi
+	container_date=$(date +%s --date="$(docker inspect --format "{{.Created}}" $container)")
+	container_seconds=$((curdate-container_date))
 
-	container_hours=$(($container_days*24 + $container_hours))
-	if [ "$container_hours" -gt "$hours" ]; then
+	if [ "$(($container_seconds/3600))" -gt "$hours" ]; then
             rm_containers=("${rm_containers[@]}" $container)
 	fi
     done