diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-06 19:54:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-06 19:54:18 +0000 |
| commit | 1f01ef37a465a1659189ee5cdfb14c8cffc50a50 (patch) | |
| tree | effff353b2040570ca7f83b2f4de6f100244f1bf | |
| parent | 825edbfb158e30e529481e5d9d31524510dc433a (diff) | |
| parent | 7e8c03e3c02683bbb0c5232bba7a01b851b167ee (diff) | |
| download | kolla-1f01ef37a465a1659189ee5cdfb14c8cffc50a50.tar.gz kolla-1f01ef37a465a1659189ee5cdfb14c8cffc50a50.zip | |
Merge "remove override_install_langs option in /etc/yum.conf"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index ce2bbbd52..ebd0f8079 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -29,7 +29,8 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho RUN if [ $(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release) != "{{ supported_distro_release }}" ]; then \ echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \ fi \ - && cat /tmp/kolla_bashrc >> /etc/bashrc + && cat /tmp/kolla_bashrc >> /etc/bashrc \ + && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/yum.conf #### BEGIN REPO ENABLEMENT # Turns on Elasticsearch repos |