diff options
| -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' |