From 49e01fc4720bf370a955f422dd5fe90c80c6bbb6 Mon Sep 17 00:00:00 2001
From: root <root@curious.host.com>
Date: Fri, 19 Sep 2025 07:53:20 +0000
Subject: [PATCH] =?UTF-8?q?[#1]=20=E4=BC=98=E5=8C=96=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=EF=BC=8C=E5=89=8D=E7=BD=AEUID/GID=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/log/elasticsearch/build/Dockerfile | 9 +++++----
 src/log/kibana/build/Dockerfile        | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/log/elasticsearch/build/Dockerfile b/src/log/elasticsearch/build/Dockerfile
index c914153..bf19c23 100644
--- a/src/log/elasticsearch/build/Dockerfile
+++ b/src/log/elasticsearch/build/Dockerfile
@@ -3,6 +3,11 @@ FROM docker.elastic.co/elasticsearch/elasticsearch:8.13.4
 # 切换到 root 用户进行系统级安装
 USER root
 
+# 修改elasticsearch用户的UID和GID
+RUN usermod -u 2133 elasticsearch && \
+    groupmod -g 2015 elasticsearch && \
+    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
+
 # 设置构建参数
 ARG USE_INTRANET=false
 
@@ -29,10 +34,6 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \
 # 创建 supervisor 日志目录
 RUN mkdir -p /var/log/supervisor
 
-# 修改elasticsearch用户的UID和GID
-RUN usermod -u 2133 elasticsearch && \
-    groupmod -g 2015 elasticsearch && \
-    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
 
 # 复制 supervisor 配置文件
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
diff --git a/src/log/kibana/build/Dockerfile b/src/log/kibana/build/Dockerfile
index c130ab8..bf2aa8c 100644
--- a/src/log/kibana/build/Dockerfile
+++ b/src/log/kibana/build/Dockerfile
@@ -3,6 +3,11 @@ FROM docker.elastic.co/kibana/kibana:8.13.4
 # 切换到 root 用户进行系统级安装
 USER root
 
+# 修改kibana用户的UID和GID
+RUN usermod -u 2133 kibana && \
+    groupmod -g 2015 kibana && \
+    chown -R kibana:kibana /usr/share/kibana
+
 # 设置构建参数
 ARG USE_INTRANET=false
 
@@ -29,10 +34,6 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \
 # 创建 supervisor 日志目录
 RUN mkdir -p /var/log/supervisor
 
-# 修改kibana用户的UID和GID
-RUN usermod -u 2133 kibana && \
-    groupmod -g 2015 kibana && \
-    chown -R kibana:kibana /usr/share/kibana
 
 # 复制 supervisor 配置文件
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf