From eb31643a874a889fe3693bd040fcac1d06cff43c Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Sep 2025 04:42:54 +0000 Subject: [PATCH] =?UTF-8?q?[#1]=20=E5=AE=B9=E5=99=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B8=B8=E7=94=A8=E5=B7=A5=E5=85=B7=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/log/elasticsearch/build/Dockerfile | 11 ++++++++--- src/log/kibana/build/Dockerfile | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/log/elasticsearch/build/Dockerfile b/src/log/elasticsearch/build/Dockerfile index c5473e0..91663c6 100644 --- a/src/log/elasticsearch/build/Dockerfile +++ b/src/log/elasticsearch/build/Dockerfile @@ -15,12 +15,17 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \ echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \ fi -# 安装 supervisor +# 安装 supervisor, net-tools, vim RUN apt-get update && \ - apt-get install -y supervisor && \ + apt-get install -y supervisor net-tools vim && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# 配置部署时使用的apt源 +RUN if [ "$USE_INTRANET" = "true" ]; then \ + echo "deb [trusted=yes] https://10.92.132.52/mirrors/ubuntu2204/ jammy main" > /etc/apt/sources.list; \ + fi + # 创建 supervisor 日志目录 RUN mkdir -p /var/log/supervisor @@ -38,4 +43,4 @@ USER root EXPOSE 9200 9300 # 使用 supervisor 作为入口点 -CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] \ No newline at end of file +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] diff --git a/src/log/kibana/build/Dockerfile b/src/log/kibana/build/Dockerfile index 7c007d7..93267ee 100644 --- a/src/log/kibana/build/Dockerfile +++ b/src/log/kibana/build/Dockerfile @@ -10,17 +10,22 @@ ARG USE_INTRANET=false RUN if [ "$USE_INTRANET" = "true" ]; then \ echo "Configuring intranet apt sources..." && \ cp /etc/apt/sources.list /etc/apt/sources.list.bak && \ - echo "deb [trusted=yes] http://10.68.64.1/ubuntu2204/ jammy main" > /etc/apt/sources.list && \ + echo "deb [trusted=yes] http://10.68.64.1/ubuntu2204/ jammy main" > /etc/apt/sources.list && \ echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/99disable-ssl-check && \ echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \ fi -# 安装 supervisor +# 安装 supervisor, net-tools, vim RUN apt-get update && \ - apt-get install -y supervisor && \ + apt-get install -y supervisor net-tools vim && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# 配置部署时使用的apt源 +RUN if [ "$USE_INTRANET" = "true" ]; then \ + echo "deb [trusted=yes] https://10.92.132.52/mirrors/ubuntu2204/ jammy main" > /etc/apt/sources.list; \ + fi + # 创建 supervisor 日志目录 RUN mkdir -p /var/log/supervisor