From 2588b9e0905f40c42489bbf8ec11c3877e92f75a Mon Sep 17 00:00:00 2001 From: David Carlos Date: Aug 03 2017 16:51:10 +0000 Subject: Use check_output instead of the docker library. - related #38 --- diff --git a/kiskadee/analyzers.py b/kiskadee/analyzers.py index 397b688..9f02a98 100644 --- a/kiskadee/analyzers.py +++ b/kiskadee/analyzers.py @@ -1,7 +1,6 @@ """This module provides functions to run static analyzers.""" -import docker -from subprocess import check_output +import subprocess def run(analyzer, sources): """Run a static analyzer on a given package. @@ -10,9 +9,8 @@ def run(analyzer, sources): `sources` is the absolute path for the uncompressed package. Returns a analysis results. """ - volume = {sources: {'bind': '/src', 'mode': 'Z'}} - client = docker.from_env(version='auto') - uid = int(check_output("echo $UID", shell=True)) - return client.containers.run(analyzer, '/src', volumes=volume, - environment={'KISKADEE_UID': uid}, - stderr=True, stdout=True, tty=True) + volume = ''.join([sources, ':', '/src']) + uid = int(subprocess.check_output("echo $UID", shell=True)) + return subprocess.check_output("docker run -e KISKADEE_UID={} "\ + "-v {} {}".format(uid, volume, analyzer), + shell=True, stderr=subprocess.STDOUT) diff --git a/util/dockerfiles/flawfinder/docker-entrypoint.sh b/util/dockerfiles/flawfinder/docker-entrypoint.sh index af7548a..cff174a 100644 --- a/util/dockerfiles/flawfinder/docker-entrypoint.sh +++ b/util/dockerfiles/flawfinder/docker-entrypoint.sh @@ -4,4 +4,4 @@ useradd -ms /bin/bash kiskadee -u $KISKADEE_UID chown -R kiskadee:kiskadee /src chmod -R 755 /src cd /src -flawfinder -S . +flawfinder -S --quiet .