X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FContainerUtils.py;h=478a9781a023823920370adbf9d414c6d45b7b75;hb=ada7009a3c826430e83a29c31bdf9a5973986ad9;hp=eadc0a8a5a42f6206c762e4bb058770d5d2f70c7;hpb=325bf96ce5fc13780fab0731855a2e2092208a2b;p=csit.git diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index eadc0a8a5a..478a9781a0 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -479,9 +479,7 @@ class ContainerEngine(object): class LXC(ContainerEngine): """LXC implementation.""" - def __init__(self): - """Initialize LXC object.""" - super(LXC, self).__init__() + # Implicit constructor is inherited. def acquire(self, force=True): """Acquire a privileged system object where configuration is stored. @@ -672,9 +670,7 @@ class LXC(ContainerEngine): class Docker(ContainerEngine): """Docker implementation.""" - def __init__(self): - """Initialize Docker object.""" - super(Docker, self).__init__() + # Implicit constructor is inherited. def acquire(self, force=True): """Pull an image or a repository from a registry. @@ -689,7 +685,10 @@ class Docker(ContainerEngine): else: return - cmd = 'docker pull {c.image}'.format(c=self.container) + image = self.container.image if self.container.image else\ + "ubuntu:xenial-20180412" + + cmd = 'docker pull {image}'.format(image=image) ret, _, _ = self.container.ssh.exec_command_sudo(cmd, timeout=1800) if int(ret) != 0: