projectatomic/atomic
1
0
Fork 0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-06 21:45:24 +01:00
Code Issues Releases Activity

pull: add pull from docker daemon

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2016-04-09 11:31:12 +02:00
parent f932f5d93d
commit fdccba48c3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Atomic/atomic.py
View File

@@ -320,6 +320,8 @@ class Atomic(object):
def _pull_image_to_ostree(self, repo, image, upgrade):
if image.startswith("ostree:"):
self._check_system_ostree_image(repo, image, upgrade)
elif self.args.image.startswith("docker:"):
self._pull_docker_image(repo, image.replace("docker:", ""))
elif self.args.image.startswith("dockertar:"):
self._pull_docker_tar(repo, image.replace("dockertar:", ""))
else: # Assume "oci:"
@@ -947,6 +949,11 @@ class Atomic(object):
repo.commit_transaction(None)
def _pull_docker_image(self, repo, image):
with tempfile.NamedTemporaryFile(mode="w") as temptar:
subprocess.check_call(["docker", "save", "-o", temptar.name, image])
return self._pull_docker_tar(repo, temptar.name)
def _pull_docker_tar(self, repo, image):
temp_dir = tempfile.mkdtemp()
try: