diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rwxr-xr-x | kolla/cmd/build.py | 1 | ||||
| -rw-r--r-- | kolla/common/config.py | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5cf3633c0..47d90ab6a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ base_distro }}:{{ base_distro_tag }} +FROM {{ base_image }}:{{ base_distro_tag }} MAINTAINER {{ maintainer }} LABEL kolla_version="{{ kolla_version }}" diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 9b818cb1d..b24cd9282 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -479,6 +479,7 @@ class KollaWorker(object): loader=jinja2.FileSystemLoader(path)) template = env.get_template(template_name) values = {'base_distro': self.base, + 'base_image': self.conf.base_image, 'base_distro_tag': self.base_tag, 'install_metatype': self.install_metatype, 'image_prefix': self.image_prefix, diff --git a/kolla/common/config.py b/kolla/common/config.py index 31836c4ba..83ccfb0fb 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -56,10 +56,12 @@ _CLI_OPTS = [ cfg.StrOpt('base', short='b', default='centos', choices=BASE_OS_DISTRO, deprecated_group='kolla-build', - help='The base distro to use when building'), + help='The distro type of the base image'), cfg.StrOpt('base-tag', default='latest', deprecated_group='kolla-build', help='The base distro image tag'), + cfg.StrOpt('base-image', default=None, + help='The base image name. Default is the same with base'), cfg.BoolOpt('debug', short='d', default=False, deprecated_group='kolla-build', help='Turn on debugging log level'), @@ -288,3 +290,5 @@ def parse(conf, args, usage=None, prog=None, prog=prog, version=version.cached_version_string(), default_config_files=default_config_files) + if not conf.base_image: + conf.base_image = conf.base |