diff options
| author | Dincer Celik <hello@dincercelik.com> | 2019-11-22 10:36:38 +0300 |
|---|---|---|
| committer | Dincer Celik <hello@dincercelik.com> | 2019-12-08 09:06:03 +0000 |
| commit | b8c743092ca873543b44794489c62e9c8d2e2d80 (patch) | |
| tree | 10ff46c93c0af56682c62e5b825a581734d09acc | |
| parent | 19c38d9c9d6416b7859037396484fff2e587ec4b (diff) | |
| download | kolla-b8c743092ca873543b44794489c62e9c8d2e2d80.tar.gz kolla-b8c743092ca873543b44794489c62e9c8d2e2d80.zip | |
Ensure lsb-release exists on debian/ubuntu
Change-Id: I74142928d97af932a04e33476771360579e01ee7
Closes-Bug: #1853474
(cherry picked from commit 05c84fdf86d62545043cd36b984ca7627308d63d)
| -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 8cb82103e..edd7b1d6e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -279,8 +279,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 c9a8c5141..a6ef62bd7 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 = 'train' |