aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-01-26 13:08:22 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-02-15 14:06:05 +0100
commitad3c18608f2eb02db148faff15eb3ac7c99b7526 (patch)
tree2e5ecb939082581691dfac50002d7ce15320f395
parent60bb16520c42c3cbe8d720cb90bf452223971adb (diff)
downloadkolla-ad3c18608f2eb02db148faff15eb3ac7c99b7526.tar.gz
kolla-ad3c18608f2eb02db148faff15eb3ac7c99b7526.zip
base: print release version in case of running unsupported one
User may provide own base image but it needs to be supported one. If it is not then we print info and error out. So provide user with info which release is present in their image. Change-Id: I0d8417fdeb2f02138d03cc57bd3b7b95bc43fc8f
-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 2af50509f..8cb093be4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -271,8 +271,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