tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 21:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3921 from shin-/3890-pull-services

Browse Source 
Fix command hint in bundle to pull services instead of images
This commit is contained in:
Daniel Nephin 2016-09-13 10:32:14 -04:00 committed by GitHub
commit 9faa852d41
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compose/bundle.py
View File

@ -46,8 +46,9 @@ class NeedsPush(Exception):
class NeedsPull(Exception): class NeedsPull(Exception):
def __init__(self, image_name): def __init__(self, image_name, service_name):
self.image_name = image_name self.image_name = image_name
self.service_name = service_name
class MissingDigests(Exception): class MissingDigests(Exception):
@ -74,7 +75,7 @@ def get_image_digests(project, allow_push=False):
except NeedsPush as e: except NeedsPush as e:
needs_push.add(e.image_name) needs_push.add(e.image_name)
except NeedsPull as e: except NeedsPull as e:
needs_pull.add(e.image_name) needs_pull.add(e.service_name)
if needs_push or needs_pull: if needs_push or needs_pull:
raise MissingDigests(needs_push, needs_pull) raise MissingDigests(needs_push, needs_pull)
@ -109,7 +110,7 @@ def get_image_digest(service, allow_push=False):
return image['RepoDigests'][0] return image['RepoDigests'][0]
if 'build' not in service.options: if 'build' not in service.options:
raise NeedsPull(service.image_name) raise NeedsPull(service.image_name, service.name)
if not allow_push: if not allow_push:
raise NeedsPush(service.image_name) raise NeedsPush(service.image_name)