From 5668427b4bf6b44d4b5137d21053379f0dd68f22 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Mon, 17 Oct 2016 10:54:47 +0200 Subject: [PATCH] Merge run commands in elasticsearch container TrivialFix Change-Id: Ie7d090ad4665a3549a8072eed30ab1b820354c83 --- docker/elasticsearch/Dockerfile.j2 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 1b3a2badf7..5cb80f5a6c 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -26,16 +26,17 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ {{ macros.install_packages(elasticsearch_packages | customizable("packages")) }} COPY elasticsearch_sudoers /etc/sudoers.d/kolla_elasticsearch_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start + +# NOTE: By default the shell of the elasticsearch user is /bin/false. We have to +# change the shell to /bin/bash to be able to run elasticsearch as a non-root user. +# +# https://discuss.elastic.co/t/running-as-non-root-user-service-wrapper-has-changed/7863 + RUN chmod 755 /usr/local/bin/kolla_extend_start \ && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_elasticsearch_sudoers \ - && usermod -a -G kolla elasticsearch - - -# by default elasticsearch shell is /bin/false, we need -# /bin/bash to run elasticsearch as non-root -# https://discuss.elastic.co/t/running-as-non-root-user-service-wrapper-has-changed/7863 -RUN usermod -s /bin/bash elasticsearch -d /usr/share/elasticsearch + && usermod -a -G kolla elasticsearch \ + && usermod -s /bin/bash elasticsearch -d /usr/share/elasticsearch {% block elasticsearch_footer %}{% endblock %} {% block footer %}{% endblock %}