diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-26 03:02:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-26 03:02:09 +0000 |
| commit | 60021eced02248e140a3fb75d80d7cff05bf821d (patch) | |
| tree | c469c546944467cc0347229e24a2d808b7560da8 | |
| parent | 387678b7b1f949fb0c27456fc4bd5e296fbe96fa (diff) | |
| parent | 2424d69d59ffd6b7079bc9d5707287f6fcf17891 (diff) | |
| download | kolla-60021eced02248e140a3fb75d80d7cff05bf821d.tar.gz kolla-60021eced02248e140a3fb75d80d7cff05bf821d.zip | |
Merge "Fix wording around supported releases in base"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 0c8361131..3bf447288 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -35,7 +35,7 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release); \ if [ $CURRENT_DISTRO_RELEASE != "{{ supported_distro_release }}" ]; then \ - echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \ + echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; \ fi \ && cat /tmp/kolla_bashrc >> /etc/bashrc \ && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/yum.conf @@ -204,7 +204,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \ - echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; fi + echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; fi # Customize PS1 bash shell RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc |