From fe777f4e76263a10def1e2e507c429971e05cd04 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Thu, 23 Feb 2017 14:39:11 +0000 Subject: Update oraclelinux tag to new slim base image Oracle have released a slimmed down version of their base image, using the tag '7-slim'[0]. This is over half the size of the standard image. Note, right now the default base tags are also used to check that we're building on a supported distro version, e.g. oraclelinux:7. This breaks when we want to set a default base tag that is different to what's in /etc/system-release or /etc/lsb-release, e.g. 7-slim. Decouple this info so we have access to both sets of data. [0] https://blogs.oracle.com/developers/put-your-containers-on-a-diet-with-oracle-linux Depends-On: Id7df645284f260cd615188db2efe889c9cf8115d Change-Id: I584ac9514950c541005bb900c19fc1c6c7ed2a5d --- kolla/common/config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index e5a3cedfa..e87d509f5 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -20,6 +20,13 @@ from kolla.version import version_info as version BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian'] BASE_ARCH = ['x86_64'] +DEFAULT_BASE_TAGS = { + 'centos': '7', + 'rhel': '7', + 'oraclelinux': '7-slim', + 'debian': '8', + 'ubuntu': '16.04', +} DISTRO_RELEASE = { 'centos': '7', 'rhel': '7', @@ -847,7 +854,7 @@ def parse(conf, args, usage=None, prog=None, # NOTE(jeffrey4l): set the default base tag based on the # base option - conf.set_default('base_tag', DISTRO_RELEASE.get(conf.base)) + conf.set_default('base_tag', DEFAULT_BASE_TAGS.get(conf.base)) if not conf.base_image: conf.base_image = conf.base -- cgit v1.2.3