aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-03-25 22:10:46 +0000
committerGerrit Code Review <review@openstack.org>2021-03-25 22:10:46 +0000
commit20aad9dc48f04507df016b1e93b04bd5c9043e68 (patch)
treeabac4a6bcba2512d0020aeb7ccd595fe1224faa7 /docker/base
parent728f095fd9720c245fd08381e244c11fc6674bb4 (diff)
parentad3c18608f2eb02db148faff15eb3ac7c99b7526 (diff)
downloadkolla-20aad9dc48f04507df016b1e93b04bd5c9043e68.tar.gz
kolla-20aad9dc48f04507df016b1e93b04bd5c9043e68.zip
Merge "base: print release version in case of running unsupported one"
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 151e86440..539f354ac 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -275,8 +275,8 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
# Ensure lsb_release exists
{{ macros.install_packages(['lsb-release']) }}
-RUN if [ $(lsb_release -r -s) != "{{ supported_distro_release }}" ]; then \
- echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; fi
+RUN RELEASE=$(lsb_release -r -s); if [ $RELEASE != "{{ supported_distro_release }}" ]; then \
+ echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }} while you have '$RELEASE'."; false; fi
# Customize PS1 bash shell
# enlarge 'system users' range so 'haproxy' package will not complain