diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-17 18:35:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-17 18:35:52 +0000 |
| commit | 982f6ff4427ee73bfc0604c754afb8860df93321 (patch) | |
| tree | 80b6abab0d826119f684bbf16eb3104ea3152603 /docker | |
| parent | ac458c8ccc907903089197e7b34c1b0504d903a3 (diff) | |
| parent | 5668427b4bf6b44d4b5137d21053379f0dd68f22 (diff) | |
| download | kolla-982f6ff4427ee73bfc0604c754afb8860df93321.tar.gz kolla-982f6ff4427ee73bfc0604c754afb8860df93321.zip | |
Merge "Merge run commands in elasticsearch container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 1b3a2badf..5cb80f5a6 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 %} |