From 05c84fdf86d62545043cd36b984ca7627308d63d Mon Sep 17 00:00:00 2001
From: Dincer Celik <hello@dincercelik.com>
Date: Fri, 22 Nov 2019 10:36:38 +0300
Subject: Ensure lsb-release exists on debian/ubuntu

Change-Id: I74142928d97af932a04e33476771360579e01ee7
Closes-Bug: #1853474
---
 docker/base/Dockerfile.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker')

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
-- 
cgit v1.2.3