Merge pull request #37219 from Crassirostris/es-logging-image-fix

Automatic merge from submit-queue Elasticsearch data mount is chowned after container start Fix https://github.com/kubernetes/kubernetes/issues/37030 @piosz

Merge pull request #37219 from Crassirostris/es-logging-image-fix
fd6a805a · Kubernetes Submit Queue · GitHub · 93223048 · 1c63e064 · fd6a805a
Commit fd6a805a authored Nov 22, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

Dockerfile cluster/addons/fluentd-elasticsearch/es-image/Dockerfile +3 -3

run.sh cluster/addons/fluentd-elasticsearch/es-image/run.sh +3 -1

No files found.
--- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -44,9 +44,9 @@ COPY elasticsearch_logging_discovery /

 RUN useradd --no-create-home --user-group elasticsearch \
    && mkdir /data \
-    && chown -R elasticsearch:elasticsearch /elasticsearch /elasticsearch_logging_discovery /run.sh /data
+    && chown -R elasticsearch:elasticsearch /elasticsearch

 VOLUME ["/data"]
 EXPOSE 9200 9300

-CMD ["/bin/su", "-c", "/run.sh", "elasticsearch"]
\ No newline at end of file
+CMD /run.sh
\ No newline at end of file
--- a/cluster/addons/fluentd-elasticsearch/es-image/run.sh
+++ b/cluster/addons/fluentd-elasticsearch/es-image/run.sh
@@ -22,4 +22,6 @@ export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2}

 /elasticsearch_logging_discovery >> /elasticsearch/config/elasticsearch.yml

-/elasticsearch/bin/elasticsearch
+chown -R elasticsearch:elasticsearch /data
+
+/bin/su -c /elasticsearch/bin/elasticsearch elasticsearch