Merge pull request #45 from 2niknatan/master

Adding an environment variable to docker file, fixing -td flag and catching exceptions and adding tag to docker image

Dockerfile

@@ -53,5 +53,5 @@ RUN set -ex \
   && > /var/log/faillog \
   && > /var/log/lastlog
 
-# Default to /tmp/kubiscan/kubeconfig
-ENV CONF_PATH=/kubiscan/kubeconfig.yaml
+# Environment variable to know if running in a container
+ENV RUNNING_IN_A_CONTAINER=true

api/api_client.py

@@ -21,14 +21,14 @@
 CoreV1Api = None
 RbacAuthorizationV1Api = None
 
+
 def running_in_container():
-    with open('/proc/1/comm') as file:
-        line = file.readline().strip()
-        while line:
-            if 'systemd' in line:
-                return False
-            line = file.readline().strip()
-    return True
+    running_in_a_container = os.getenv('RUNNING_IN_A_CONTAINER')
+    if running_in_a_container is not None and running_in_a_container == 'true':
+        return True
+    return False
+
+
 def replace(file_path, pattern, subst):
     #Create temp file
     fh, abs_path = mkstemp()

docker_run.sh

@@ -17,7 +17,7 @@ if ! test -f "$kube_config"; then
 fi
 
 # Running the container.
-docker run -t -d --rm --name kubiscan_container -e CONF_PATH=/config --network host natan2nik/kubiscan:kubiscan
+docker run -t -d --rm --name kubiscan_container -e CONF_PATH=/config --network host natan2nik/kubiscan:latest
 # docker run -t -d --rm --name kubiscan_container -e CONF_PATH=/config --network host --detach kubiscan bash -c "sleep infinity"
 
 # The new container id.