github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Automatic merge from submit-queue

Elasticsearch data mount is chowned after container start

Fix https://github.com/kubernetes/kubernetes/issues/37030

@piosz
This commit is contained in:
Kubernetes Submit Queue
2016-11-22 12:41:29 -08:00
committed by GitHub
parent 9322304873 1c63e0648a
commit fd6a805a98
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View File

@@ -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"]
CMD /run.sh

4
cluster/addons/fluentd-elasticsearch/es-image/run.sh
View File

@@ -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