diff --git a/src/log/elasticsearch/build/Dockerfile b/src/log/elasticsearch/build/Dockerfile index 28717f5..c914153 100644 --- a/src/log/elasticsearch/build/Dockerfile +++ b/src/log/elasticsearch/build/Dockerfile @@ -29,6 +29,11 @@ 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/elasticsearch/build/start-es-supervised.sh b/src/log/elasticsearch/build/start-es-supervised.sh index f88151c..f2cbd75 100644 --- a/src/log/elasticsearch/build/start-es-supervised.sh +++ b/src/log/elasticsearch/build/start-es-supervised.sh @@ -16,6 +16,15 @@ fi ln -sf /private/argus/log/elasticsearch /usr/share/elasticsearch/data +# 记录容器ip地址 +DOMAIN=es.log.argus.com +IP=`ifconfig | grep -A 1 eth0 | grep inet | awk '{print $2}'` +echo current IP: ${IP} +echo ${IP} > /private/argus/etc/${DOMAIN} + +# 更新dns,执行 +/private/argus/etc/update-dns.sh + echo "[INFO] Data directory linked: /usr/share/elasticsearch/data -> /private/argus/log/elasticsearch" # 设置环境变量(ES配置通过docker-compose传递) @@ -24,4 +33,4 @@ export ES_JAVA_OPTS="${ES_JAVA_OPTS:-"-Xms512m -Xmx512m"}" echo "[INFO] Starting Elasticsearch process..." # 启动原始的Elasticsearch entrypoint -exec /usr/local/bin/docker-entrypoint.sh elasticsearch \ No newline at end of file +exec /usr/local/bin/docker-entrypoint.sh elasticsearch diff --git a/src/log/kibana/build/Dockerfile b/src/log/kibana/build/Dockerfile index 740757b..c130ab8 100644 --- a/src/log/kibana/build/Dockerfile +++ b/src/log/kibana/build/Dockerfile @@ -29,6 +29,11 @@ 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 diff --git a/src/log/kibana/build/start-kibana-supervised.sh b/src/log/kibana/build/start-kibana-supervised.sh index 44b3515..6b2e5dd 100644 --- a/src/log/kibana/build/start-kibana-supervised.sh +++ b/src/log/kibana/build/start-kibana-supervised.sh @@ -18,6 +18,12 @@ ln -sf /private/argus/log/kibana /usr/share/kibana/data echo "[INFO] Data directory linked: /usr/share/kibana/data -> /private/argus/log/kibana" +# 记录容器ip地址 +DOMAIN=kibana.log.argus.com +IP=`ifconfig | grep -A 1 eth0 | grep inet | awk '{print $2}'` +echo current IP: ${IP} +echo ${IP} > /private/argus/etc/${DOMAIN} + # 设置环境变量 export ELASTICSEARCH_HOSTS="${ELASTICSEARCH_HOSTS:-"http://es:9200"}" @@ -30,4 +36,4 @@ echo "[INFO] Starting background post-start configuration..." echo "[INFO] Starting Kibana process..." # 启动原始的Kibana entrypoint -exec /usr/local/bin/kibana-docker \ No newline at end of file +exec /usr/local/bin/kibana-docker