From ef8794b9afe07ed4fc30401b59149c657976b7d5 Mon Sep 17 00:00:00 2001 From: shin- Date: Thu, 25 Jul 2013 21:00:36 +0200 Subject: [PATCH] Script cleans up downloaded repos, uses quiet build Upstream-commit: 12d575a6b1125d74168986ca39250c833ddbb033 Component: engine --- components/engine/contrib/brew/brew/brew.py | 11 +++++++---- components/engine/contrib/brew/requirements.txt | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/components/engine/contrib/brew/brew/brew.py b/components/engine/contrib/brew/brew/brew.py index f361783d54..91f7b01b94 100644 --- a/components/engine/contrib/brew/brew/brew.py +++ b/components/engine/contrib/brew/brew/brew.py @@ -1,5 +1,6 @@ import os import logging +from shutil import rmtree import docker @@ -82,7 +83,9 @@ def build_library(repository=None, branch=None, namespace=None, push=False, summary.add_exception(buildfile, (linecnt, line), e) f.close() - summary.print_summary() + if dst_folder != repository: + rmtree(dst_folder, True) + summary.print_summary(logger) def build_repo(repository, ref, docker_repo, docker_tag, namespace, push): @@ -94,9 +97,9 @@ def build_repo(repository, ref, docker_repo, docker_tag, namespace, push): if not 'Dockerfile' in os.listdir(dst_folder): raise RuntimeError('Dockerfile not found in cloned repository') logger.info('Building using dockerfile...') - img_id, logs = client.build(path=dst_folder) - - if not img_id: + img_id, logs = client.build(path=dst_folder, quiet=True) + rmtree(dst_folder, True) + else: img_id = processed['{0}@{1}'.format(repository, ref)] logger.info('Committing to {0}:{1}'.format(docker_repo, docker_tag or 'latest')) diff --git a/components/engine/contrib/brew/requirements.txt b/components/engine/contrib/brew/requirements.txt index c66d0798d2..8006177ce6 100644 --- a/components/engine/contrib/brew/requirements.txt +++ b/components/engine/contrib/brew/requirements.txt @@ -1,2 +1,2 @@ dulwich==0.9.0 -docker-py==0.1.1 \ No newline at end of file +docker-py==0.1.2 \ No newline at end of file