Skip to content

K
k3s
Commit fd6a805a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 93223048 1c63e064
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View file @ fd6a805a
...@@ -44,9 +44,9 @@ COPY elasticsearch_logging_discovery / ...@@ -44,9 +44,9 @@ COPY elasticsearch_logging_discovery /
RUN useradd --no-create-home --user-group elasticsearch \ RUN useradd --no-create-home --user-group elasticsearch \
&& mkdir /data \ && mkdir /data \
&& chown -R elasticsearch:elasticsearch /elasticsearch /elasticsearch_logging_discovery /run.sh /data && chown -R elasticsearch:elasticsearch /elasticsearch
VOLUME ["/data"] VOLUME ["/data"]
EXPOSE 9200 9300 EXPOSE 9200 9300
CMD ["/bin/su", "-c", "/run.sh", "elasticsearch"] CMD /run.sh
\ No newline at end of file \ No newline at end of file
cluster/addons/fluentd-elasticsearch/es-image/run.sh
View file @ fd6a805a
...@@ -22,4 +22,6 @@ export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2} ...@@ -22,4 +22,6 @@ export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2}
/elasticsearch_logging_discovery >> /elasticsearch/config/elasticsearch.yml /elasticsearch_logging_discovery >> /elasticsearch/config/elasticsearch.yml
/elasticsearch/bin/elasticsearch chown -R elasticsearch:elasticsearch /data
/bin/su -c /elasticsearch/bin/elasticsearch elasticsearch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment