diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-03 16:11:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-03 16:11:02 +0000 |
| commit | 2c887565d4299462a29b98210c2a7ce233e71039 (patch) | |
| tree | 076dccb6f5c62bc6037ff548795ef72d7f6d7e92 | |
| parent | 84e800469eee6601f93e44e17e59782d6e3e02f2 (diff) | |
| parent | 9813ef84b7c66929d9592b1e3791f78c9aa30417 (diff) | |
| download | kolla-2c887565d4299462a29b98210c2a7ce233e71039.tar.gz kolla-2c887565d4299462a29b98210c2a7ce233e71039.zip | |
Merge "Not to pull the base images when building."
| -rwxr-xr-x[-rw-r--r--] | kolla/common/config.py | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/docker-build-nopull-base-a860d046b9059cfc.yaml | 6 |
3 files changed, 9 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: diff --git a/releasenotes/notes/docker-build-nopull-base-a860d046b9059cfc.yaml b/releasenotes/notes/docker-build-nopull-base-a860d046b9059cfc.yaml new file mode 100644 index 000000000..957165af1 --- /dev/null +++ b/releasenotes/notes/docker-build-nopull-base-a860d046b9059cfc.yaml @@ -0,0 +1,6 @@ +--- +features: + - Add --pull/--nopull parameter for kolla-build, when --nopull is given and + the base image is already loaded, The docker-engine will not attempt to + pull a newer version of the image. This makes sense when the registry + server of base images is unreachable. |