From c399125c9019641abaf8b56a2f673fc85df108ca Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 3 Mar 2017 10:42:27 +0100 Subject: [PATCH] syscontainers: do not fail if Docker is not running we added this code to fully resolve the image name, but let's not fail when it cannot be resolved and use the provided image name. Signed-off-by: Giuseppe Scrivano Closes: #927 Approved by: rhatdan --- Atomic/syscontainers.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Atomic/syscontainers.py b/Atomic/syscontainers.py index c104983..ad349e2 100644 --- a/Atomic/syscontainers.py +++ b/Atomic/syscontainers.py @@ -11,6 +11,7 @@ import stat import subprocess import time from .client import AtomicDocker +from Atomic.backends._docker_errors import NoDockerDaemon from ctypes import cdll, CDLL import uuid @@ -1050,12 +1051,16 @@ Warning: You may want to modify `%s` before starting the service""" % os.path.jo for i in ["oci:", "http:", "https:"]: image = image.replace(i, "") - with AtomicDocker() as client: - fqn_image = util.find_remote_image(client, image) or image - if insecure: - return ["--insecure"], "docker://" + fqn_image - else: - return None, "docker://" + fqn_image + try: + with AtomicDocker() as client: + image = util.find_remote_image(client, image) or image + except NoDockerDaemon: + pass + + if insecure: + return ["--insecure"], "docker://" + image + else: + return None, "docker://" + image def _skopeo_get_manifest(self, image): args, img = self._convert_to_skopeo(image)