diff options
| author | Dincer Celik <hello@dincercelik.com> | 2019-11-22 10:36:38 +0300 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-28 18:26:52 +0000 |
| commit | 05c84fdf86d62545043cd36b984ca7627308d63d (patch) | |
| tree | 5942a19a089ed84cb0767e6d856c116daf79b244 | |
| parent | 666531893cef0bf6fadae43c05d3906998cf8c6e (diff) | |
| download | kolla-05c84fdf86d62545043cd36b984ca7627308d63d.tar.gz kolla-05c84fdf86d62545043cd36b984ca7627308d63d.zip | |
Ensure lsb-release exists on debian/ubuntu
Change-Id: I74142928d97af932a04e33476771360579e01ee7
Closes-Bug: #1853474
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1349cc4dc..42625af7f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -277,8 +277,10 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ {# endif for install type is source for RPM based distros #} {# endif for base_package_type rpm #} {% elif base_package_type == 'deb' %} +# Ensure lsb_release exists +{{ macros.install_packages(['lsb-release']) }} -RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \ +RUN if [ $(lsb_release -r -s) != "{{ supported_distro_release }}" ]; then \ echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; fi # Customize PS1 bash shell diff --git a/kolla/common/config.py b/kolla/common/config.py index cc51f22d0..0c4dc5ae3 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -24,13 +24,13 @@ BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64'] DEFAULT_BASE_TAGS = { 'centos': '7', 'rhel': '7', - 'debian': 'buster', + 'debian': '10', 'ubuntu': '18.04', } DISTRO_RELEASE = { 'centos': '7', 'rhel': '7', - 'debian': 'buster', + 'debian': '10', 'ubuntu': '18.04', } OPENSTACK_RELEASE = 'master' |