diff --git a/Dockerfile b/Dockerfile index 2477e54..c073ac1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ LABEL maintainer="Robert Kaussow " \ org.label-schema.schema-version="1.0" ENV PY_COLORS=1 +ENV TZ=UTC ADD dist/docker_tidy-*.whl / diff --git a/dockertidy/GarbageCollector.py b/dockertidy/GarbageCollector.py index 33c652b..3f5c66b 100644 --- a/dockertidy/GarbageCollector.py +++ b/dockertidy/GarbageCollector.py @@ -295,7 +295,10 @@ class GarbageCollector: def _get_docker_client(self): config = self.config.config - return docker.APIClient(version="auto", timeout=config["http_timeout"]) + try: + return docker.APIClient(version="auto", timeout=config["http_timeout"]) + except docker.errors.DockerException as e: + self.log.sysexit_with_message("Can't create docker client\n{}".format(e)) def run(self): """Garbage collector main method.""" diff --git a/dockertidy/tests/unit/test_garbagecollector.py b/dockertidy/tests/unit/test_garbagecollector.py index f5a5c69..7d2ec97 100644 --- a/dockertidy/tests/unit/test_garbagecollector.py +++ b/dockertidy/tests/unit/test_garbagecollector.py @@ -447,3 +447,7 @@ def test_build_exclude_set_empty(gc): gc.config.config["gc"]["exclude_images"] = [] exclude_set = gc._build_exclude_set() assert exclude_set == set() + + +def test_get_docker_client(gc, mocker): + assert isinstance(gc.docker, docker.APIClient)