tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ImageManager inconsistencies 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-10-12 06:39:56 -07:00
parent c9107cff39
commit da25be8f99
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/release/release.py
View File

@ -266,7 +266,7 @@ def finalize(args):
raise ScriptError('No PR found for {}'.format(args.release)) raise ScriptError('No PR found for {}'.format(args.release))
if not check_pr_mergeable(pr_data): if not check_pr_mergeable(pr_data):
raise ScriptError('Can not finalize release with an unmergeable PR') raise ScriptError('Can not finalize release with an unmergeable PR')
if not img_manager.check_images(args.release): if not img_manager.check_images():
raise ScriptError('Missing release image') raise ScriptError('Missing release image')
br_name = branch_name(args.release) br_name = branch_name(args.release)
if not repository.branch_exists(br_name): if not repository.branch_exists(br_name):

27
script/release/release/images.py
View File

@ -27,13 +27,12 @@ class ImageManager(object):
def build_images(self, repository, files): def build_images(self, repository, files):
print("Building release images...") print("Building release images...")
repository.write_git_sha() repository.write_git_sha()
docker_client = docker.APIClient(**docker.utils.kwargs_from_env())
distdir = os.path.join(REPO_ROOT, 'dist') distdir = os.path.join(REPO_ROOT, 'dist')
os.makedirs(distdir, exist_ok=True) os.makedirs(distdir, exist_ok=True)
shutil.copy(files['docker-compose-Linux-x86_64'][0], distdir) shutil.copy(files['docker-compose-Linux-x86_64'][0], distdir)
os.chmod(os.path.join(distdir, 'docker-compose-Linux-x86_64'), 0o755) os.chmod(os.path.join(distdir, 'docker-compose-Linux-x86_64'), 0o755)
print('Building docker/compose image') print('Building docker/compose image')
logstream = docker_client.build( logstream = self.docker_client.build(
REPO_ROOT, tag='docker/compose:{}'.format(self.version), dockerfile='Dockerfile.run', REPO_ROOT, tag='docker/compose:{}'.format(self.version), dockerfile='Dockerfile.run',
decode=True decode=True
) )
@ -44,7 +43,7 @@ class ImageManager(object):
print(chunk['stream'], end='') print(chunk['stream'], end='')
print('Building test image (for UCP e2e)') print('Building test image (for UCP e2e)')
logstream = docker_client.build( logstream = self.docker_client.build(
REPO_ROOT, tag='docker-compose-tests:tmp', decode=True REPO_ROOT, tag='docker-compose-tests:tmp', decode=True
) )
for chunk in logstream: for chunk in logstream:
@ -53,13 +52,15 @@ class ImageManager(object):
if 'stream' in chunk: if 'stream' in chunk:
print(chunk['stream'], end='') print(chunk['stream'], end='')
container = docker_client.create_container( container = self.docker_client.create_container(
'docker-compose-tests:tmp', entrypoint='tox' 'docker-compose-tests:tmp', entrypoint='tox'
) )
docker_client.commit(container, 'docker/compose-tests', 'latest') self.docker_client.commit(container, 'docker/compose-tests', 'latest')
docker_client.tag('docker/compose-tests:latest', 'docker/compose-tests:{}'.format(self.version)) self.docker_client.tag(
docker_client.remove_container(container, force=True) 'docker/compose-tests:latest', 'docker/compose-tests:{}'.format(self.version)
docker_client.remove_image('docker-compose-tests:tmp', force=True) )
self.docker_client.remove_container(container, force=True)
self.docker_client.remove_image('docker-compose-tests:tmp', force=True)
@property @property
def image_names(self): def image_names(self):
@ -69,23 +70,19 @@ class ImageManager(object):
'docker/compose:{}'.format(self.version) 'docker/compose:{}'.format(self.version)
] ]
def check_images(self, version): def check_images(self):
docker_client = docker.APIClient(**docker.utils.kwargs_from_env())
for name in self.image_names: for name in self.image_names:
try: try:
docker_client.inspect_image(name) self.docker_client.inspect_image(name)
except docker.errors.ImageNotFound: except docker.errors.ImageNotFound:
print('Expected image {} was not found'.format(name)) print('Expected image {} was not found'.format(name))
return False return False
return True return True
def push_images(self): def push_images(self):
docker_client = docker.APIClient(**docker.utils.kwargs_from_env())
for name in self.image_names: for name in self.image_names:
print('Pushing {} to Docker Hub'.format(name)) print('Pushing {} to Docker Hub'.format(name))
logstream = docker_client.push(name, stream=True, decode=True) logstream = self.docker_client.push(name, stream=True, decode=True)
for chunk in logstream: for chunk in logstream:
if 'status' in chunk: if 'status' in chunk:
print(chunk['status']) print(chunk['status'])