diff options
| author | dupengfei <58750307@qq.com> | 2016-12-09 11:47:05 +0800 |
|---|---|---|
| committer | dupengfei <58750307@qq.com> | 2017-01-03 02:41:10 +0000 |
| commit | 9813ef84b7c66929d9592b1e3791f78c9aa30417 (patch) | |
| tree | 91454de00f113866e38188475202b9818a5f058f /kolla | |
| parent | 5bbab143b476d00c7a29d411d2331e2bfb31525e (diff) | |
| download | kolla-9813ef84b7c66929d9592b1e3791f78c9aa30417.tar.gz kolla-9813ef84b7c66929d9592b1e3791f78c9aa30417.zip | |
Not to pull the base images when building.
Add --pull/--nopull parameter for kolla-build, when --nopull is
given and the base image is already loaded, The docker-engine will
not attemp to pull a newer version of the image. This makes sense
when the registry server of base images is unreachable.
This feature is as same to setting "image_pull_policy" to
"IfNotPresent" while building images.
The reason why I create this feature is that, even if I have setted
base_distro_tag to a stable tag, e.g. "7" or "2016-12-13", docker
still have to wait much time to fetch the version, and return failure
when registry server is unreachable. This is a feature of docker
build --pull=True.
Change-Id: If1bd08763fb757b4f090a3163dd1dbfb8fc531d3
Implements: blueprint docker-build-nopull-base
Diffstat (limited to 'kolla')
| -rwxr-xr-x[-rw-r--r--] | kolla/common/config.py | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 7eb66075d..b08de9eed 100644..100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -205,6 +205,8 @@ _CLI_OPTS = [ cfg.StrOpt('template-override', help='Path to template override file'), cfg.StrOpt('logs-dir', help='Path to logs directory'), + cfg.BoolOpt('pull', default=True, + help='Attempt to pull a newer version of the base image.'), ] _BASE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index fde63e6a0..35029f198 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -401,7 +401,7 @@ class BuildTask(DockerTask): tar.add(plugins_path, arcname='plugins') # Pull the latest image for the base distro only - pull = True if image.parent is None else False + pull = self.conf.pull if image.parent is None else False buildargs = self.update_buildargs() try: |