src/log/elasticsearch/build/Dockerfile

@@ -17,7 +17,7 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \
 
 # 安装 supervisor, net-tools, vim
 RUN apt-get update && \
-    apt-get install -y supervisor net-tools inetutils-ping vim && \
+    apt-get install -y supervisor net-tools vim && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -29,11 +29,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
 

src/log/elasticsearch/build/start-es-supervised.sh

@@ -16,15 +16,6 @@ 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传递）

src/log/kibana/build/Dockerfile

@@ -17,7 +17,7 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \
 
 # 安装 supervisor, net-tools, vim
 RUN apt-get update && \
-    apt-get install -y supervisor net-tools inetutils-ping vim && \
+    apt-get install -y supervisor net-tools vim && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -29,11 +29,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
 

src/log/kibana/build/start-kibana-supervised.sh

@@ -18,12 +18,6 @@ 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"}"