diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-22 09:02:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-22 09:02:23 +0000 |
| commit | efe314b992fc3b2bf5fc4f379db00c65ad766b68 (patch) | |
| tree | 8658b8e009bedd964d7088eb0318d75b93a54a38 /kolla/common/config.py | |
| parent | e2666505a68875856c1785a5a7e18480c75eebc3 (diff) | |
| parent | d98a102162ff76b09771585ec21ca23415335b90 (diff) | |
| download | kolla-efe314b992fc3b2bf5fc4f379db00c65ad766b68.tar.gz kolla-efe314b992fc3b2bf5fc4f379db00c65ad766b68.zip | |
Merge "Support squash docker images layers"
Diffstat (limited to 'kolla/common/config.py')
| -rwxr-xr-x | kolla/common/config.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 081f6063e..02ab17f09 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -258,6 +258,10 @@ _CLI_OPTS = [ help='Attempt to pull a newer version of the base image'), cfg.StrOpt('work-dir', help=('Path to be used as working directory.' ' By default, a temporary dir is created')), + cfg.BoolOpt('squash', default=False, + help=('Squash the image layers. WARNING: it will consume lots' + ' of disk IO. "docker-squash" tool is required, install' + ' it by "pip install docker-squash"')), ] _BASE_OPTS = [ @@ -269,7 +273,11 @@ _BASE_OPTS = [ help=('Comma separated list of .rpm or .repo file(s) ' 'or URL(s) to install before building containers')), cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')), - cfg.StrOpt('apt_preferences', help=('Path to custom apt/preferences')) + cfg.StrOpt('apt_preferences', help=('Path to custom apt/preferences')), + cfg.BoolOpt('squash-cleanup', default=True, + help='Remove source image from Docker after squashing'), + cfg.StrOpt('squash-tmp-dir', + help='Temporary directory to be used during squashing') ] |