From 9928700e626a99ac635f4c1b6a16e34cb2096e6a Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Fri, 6 Oct 2017 11:40:20 +0200
Subject: [PATCH 1/3] update check_docker_clean.sh

---
 check_docker_clean.sh | 45 ++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/check_docker_clean.sh b/check_docker_clean.sh
index 3bd90f8c..3a91bce2 100755
--- a/check_docker_clean.sh
+++ b/check_docker_clean.sh
@@ -19,23 +19,42 @@ srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 . "$srcdir/docker.sh"
 
+# Caches we want to check have been removed:
+#
+# .cache => Python pip
+#
+# .cpan  => Perl
+# .cpanm
+#
+# .gem   => Ruby
+#
+# Java / Scala / Groovy:
+#
+# .m2     => Maven
+# .sbt    => SBT
+# .gradle => Gradle
+# .groovy => Groovy
+# .ivy    => Ivy (Sbt / Gradle)
+# .ivy2
+
+cache_list="
+.cache
+.cpan
+.cpanm
+.m2
+.ivy
+.ivy2
+.sbt
+"
+
 if is_inside_docker; then
-    # Python pip => .cache
-    # Perl       => .cpan / .cpanm
-    # Ruby       => .gem
-    # Java / Scala / Groovy:
-    #   Maven    => .m2
-    #   Ivy      => .ivy .ivy2
-    #       (Sbt / Gradle)
     for x in \
-        .cache \
-        .cpan \
-        .cpanm \
-        .m2 \
-        .ivy \
-        .ivy2 \
         ; do
         for y in /root ~; do
+            # This might fail if we're not running as root :-/
+            # consider sudo'ing and find / -type d -name $x but that might find .cache under some app or something, although we should probably remove that too
+            # for now this is good enough as most dockers are built as root
+            # should test for sudo availability as well
             if [ -e "$y/$x" ]; then
                 echo "$y/$x detected, should have been removed from docker build"
                 exit 1

From bb6dc8b7d2d51c5f356616827c75d1fdea4baab4 Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Fri, 6 Oct 2017 12:31:24 +0200
Subject: [PATCH 2/3] update check_pytools.sh

---
 check_pytools.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/check_pytools.sh b/check_pytools.sh
index 4bbda39c..30378ff9 100755
--- a/check_pytools.sh
+++ b/check_pytools.sh
@@ -18,6 +18,7 @@ set -euo pipefail
 srcdir2="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 . "$srcdir2/utils.sh"
+. "$srcdir2/docker.sh"
 
 srcdir="$srcdir2"
 
@@ -34,6 +35,9 @@ if [ "$PROJECT" = "pytools" ]; then
 elif [ "$PROJECT" = "Dockerfiles" ]; then
     echo "detected running in Dockerfiles repo, skipping checks here as will be called in bash-tools/all.sh..."
     skip_checks=1
+elif is_inside_docker; then
+    echo "detected running inside Docker, skipping pytools checks"
+    skip_checks=1
 fi
 
 if [ $skip_checks = 1 ]; then

From c5e989442b4388d478a3522bf9474214735c06a7 Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Fri, 6 Oct 2017 12:36:22 +0200
Subject: [PATCH 3/3] update check_docker_clean.sh

---
 check_docker_clean.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/check_docker_clean.sh b/check_docker_clean.sh
index 3a91bce2..4349e1d3 100755
--- a/check_docker_clean.sh
+++ b/check_docker_clean.sh
@@ -30,20 +30,23 @@ srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 #
 # Java / Scala / Groovy:
 #
-# .m2     => Maven
-# .sbt    => SBT
 # .gradle => Gradle
 # .groovy => Groovy
 # .ivy    => Ivy (Sbt / Gradle)
 # .ivy2
+# .m2     => Maven
+# .sbt    => SBT
 
 cache_list="
 .cache
 .cpan
 .cpanm
-.m2
+.gem
+.gradle
+.groovy
 .ivy
 .ivy2
+.m2
 .sbt
 "
 
@@ -61,4 +64,8 @@ if is_inside_docker; then
             fi
         done
     done
+    if [ -n "$(find / -type f -name pytools_checks)" ]; then
+        echo "pytools_checks detected, should have been removed from docker build"
+        exit 1
+    fi
 fi