diff --git a/src/log/elasticsearch/build/Dockerfile b/src/log/elasticsearch/build/Dockerfile index e030326..c5473e0 100644 --- a/src/log/elasticsearch/build/Dockerfile +++ b/src/log/elasticsearch/build/Dockerfile @@ -31,10 +31,6 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY start-es-supervised.sh /usr/local/bin/start-es-supervised.sh RUN chmod +x /usr/local/bin/start-es-supervised.sh -# 创建数据目录并设置权限 -RUN mkdir -p /private/argus/log/elasticsearch && \ - chown -R elasticsearch:elasticsearch /private/argus/log/elasticsearch - # 保持 root 用户,由 supervisor 管理用户切换 USER root diff --git a/src/log/elasticsearch/build/start-es-supervised.sh b/src/log/elasticsearch/build/start-es-supervised.sh index 10973c7..f88151c 100644 --- a/src/log/elasticsearch/build/start-es-supervised.sh +++ b/src/log/elasticsearch/build/start-es-supervised.sh @@ -3,8 +3,9 @@ set -euo pipefail echo "[INFO] Starting Elasticsearch under supervisor..." -# 创建数据目录(如果不存在) +# 创建数据目录并设置权限(如果不存在) mkdir -p /private/argus/log/elasticsearch +chown -R elasticsearch:elasticsearch /private/argus/log/elasticsearch # 创建软链接到Elasticsearch预期的数据目录 if [ -L /usr/share/elasticsearch/data ]; then diff --git a/src/log/kibana/build/Dockerfile b/src/log/kibana/build/Dockerfile index 768cf6b..6af5bba 100644 --- a/src/log/kibana/build/Dockerfile +++ b/src/log/kibana/build/Dockerfile @@ -32,10 +32,6 @@ COPY start-kibana-supervised.sh /usr/local/bin/start-kibana-supervised.sh COPY kibana-post-start.sh /usr/local/bin/kibana-post-start.sh RUN chmod +x /usr/local/bin/start-kibana-supervised.sh /usr/local/bin/kibana-post-start.sh -# 创建数据目录并设置权限 -RUN mkdir -p /private/argus/log/kibana && \ - chown -R kibana:kibana /private/argus/log/kibana - # 保持 root 用户,由 supervisor 管理用户切换 USER root diff --git a/src/log/kibana/build/start-kibana-supervised.sh b/src/log/kibana/build/start-kibana-supervised.sh index b2b98fc..44b3515 100644 --- a/src/log/kibana/build/start-kibana-supervised.sh +++ b/src/log/kibana/build/start-kibana-supervised.sh @@ -3,8 +3,9 @@ set -euo pipefail echo "[INFO] Starting Kibana under supervisor..." -# 创建数据目录(如果不存在) +# 创建数据目录并设置权限(如果不存在) mkdir -p /private/argus/log/kibana +chown -R kibana:kibana /private/argus/log/kibana # 创建软链接到Kibana预期的数据目录 if [ -L /usr/share/kibana/data ]; then