aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorjiangpch <jiangpch@gohighsec.com>2016-10-28 10:41:52 -0400
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-11-06 12:57:09 +0000
commit7e8c03e3c02683bbb0c5232bba7a01b851b167ee (patch)
treec004e4d39cf29bbeb72f8612fbe226a7e722b5fd /docker
parentb7bac2fba0f6ff16630b03017dbc971b3b8deb67 (diff)
downloadkolla-7e8c03e3c02683bbb0c5232bba7a01b851b167ee.tar.gz
kolla-7e8c03e3c02683bbb0c5232bba7a01b851b167ee.zip
remove override_install_langs option in /etc/yum.conf
Closes-Bug: #1637803 Change-Id: I5c22b76379b1dce1673124ac8b46b894449405a5
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j23
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