1
0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-06 12:45:57 +01:00

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 <gscrivan@redhat.com>

Closes: #927
Approved by: rhatdan
This commit is contained in:
Giuseppe Scrivano
2017-03-03 10:42:27 +01:00
committed by Atomic Bot
parent ddc5cea1d3
commit c399125c90

View File

@@ -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)