diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-28 22:29:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-28 22:29:39 +0000 |
| commit | 9938857d7d331743d71328831241edf21e42d160 (patch) | |
| tree | 0f64e2e85a8ad250697f66129713683de57211bc /docker/base | |
| parent | 37de8920aa7394089731c0fae75034c2c3d137ca (diff) | |
| parent | 05c84fdf86d62545043cd36b984ca7627308d63d (diff) | |
| download | kolla-9938857d7d331743d71328831241edf21e42d160.tar.gz kolla-9938857d7d331743d71328831241edf21e42d160.zip | |
Merge "Ensure lsb-release exists on debian/ubuntu"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 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 |
