diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-03 11:10:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-03 11:10:44 +0000 |
| commit | d571f8393987c07944a73b032bc572c22a2cf46a (patch) | |
| tree | 1b01c4cfadd749bfdb1856a68fbf530da7ce09a6 /kolla/image | |
| parent | de3978b7026533c186f19a36a66bf733ac883c8d (diff) | |
| parent | 8b38c4d5c9f62b7cb42d8e885cea56f188ab9110 (diff) | |
| download | kolla-d571f8393987c07944a73b032bc572c22a2cf46a.tar.gz kolla-d571f8393987c07944a73b032bc572c22a2cf46a.zip | |
Merge "Add work-dir command-line option"
Diffstat (limited to 'kolla/image')
| -rwxr-xr-x | kolla/image/build.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 133063513..a6736172e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -633,10 +633,14 @@ class KollaWorker(object): def setup_working_dir(self): """Creates a working directory for use while building""" - ts = time.time() - ts = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d_%H-%M-%S_') - self.temp_dir = tempfile.mkdtemp(prefix='kolla-' + ts) - self.working_dir = os.path.join(self.temp_dir, 'docker') + if self.conf.work_dir: + self.working_dir = os.path.join(self.conf.work_dir, 'docker') + else: + ts = time.time() + ts = datetime.datetime.fromtimestamp(ts).strftime( + '%Y-%m-%d_%H-%M-%S_') + self.temp_dir = tempfile.mkdtemp(prefix='kolla-' + ts) + self.working_dir = os.path.join(self.temp_dir, 'docker') shutil.copytree(self.images_dir, self.working_dir) self.copy_apt_files() LOG.debug('Created working dir: %s', self.working_dir) @@ -754,7 +758,8 @@ class KollaWorker(object): def cleanup(self): """Remove temp files""" - shutil.rmtree(self.temp_dir) + if not self.conf.work_dir: + shutil.rmtree(self.temp_dir) def filter_images(self): """Filter which images to build""" |