Handle docker pull exception, improve #441, fix #568

projectatomic · Mar 2, 2016 · bed3215 · bed3215
1 parent 8bda4bd
commit bed3215
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/atomicapp/cli/main.py b/atomicapp/cli/main.py
@@ -37,7 +37,7 @@
                                  LOGGER_DEFAULT,
                                  PROVIDERS)
 from atomicapp.nulecule import NuleculeManager
-from atomicapp.nulecule.exceptions import NuleculeException
+from atomicapp.nulecule.exceptions import NuleculeException, DockerException
 from atomicapp.utils import Utils
 
 logger = logging.getLogger(LOGGER_DEFAULT)
@@ -106,6 +106,9 @@ def cli_run(args):
         else:
             print_app_location(nm.app_path)
         sys.exit(0)
+    except DockerException as e:
+        logger.error(e)
+        sys.exit(1)
     except NuleculeException as e:
         logger.error(e)
         sys.exit(1)

diff --git a/atomicapp/nulecule/container.py b/atomicapp/nulecule/container.py
@@ -8,7 +8,7 @@
                                  LOGGER_DEFAULT,
                                  MAIN_FILE)
 from atomicapp.utils import Utils
-from atomicapp.nulecule.exceptions import NuleculeException
+from atomicapp.nulecule.exceptions import NuleculeException, DockerException
 
 cockpit_logger = logging.getLogger(LOGGER_COCKPIT)
 logger = logging.getLogger(LOGGER_DEFAULT)
@@ -60,7 +60,7 @@ def pull(self, image, update=False):
         if self.dryrun:
             logger.info("DRY-RUN: %s", pull_cmd)
         elif subprocess.call(pull_cmd) != 0:
-            raise Exception("Could not pull Docker image %s" % image)
+            raise DockerException("Could not pull Docker image %s" % image)
 
         cockpit_logger.info('Skipping pulling Docker image: %s' % image)
 

diff --git a/atomicapp/nulecule/exceptions.py b/atomicapp/nulecule/exceptions.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
+class DockerException(Exception):
+    pass
+
+
 class NuleculeException(Exception):
     pass