[#1] 容器增加常用工具安装
This commit is contained in:
parent
ddec4cf1b0
commit
eb31643a87
@ -15,12 +15,17 @@ RUN if [ "$USE_INTRANET" = "true" ]; then \
|
|||||||
echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \
|
echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 安装 supervisor
|
# 安装 supervisor, net-tools, vim
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y supervisor && \
|
apt-get install -y supervisor net-tools vim && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
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 日志目录
|
# 创建 supervisor 日志目录
|
||||||
RUN mkdir -p /var/log/supervisor
|
RUN mkdir -p /var/log/supervisor
|
||||||
|
|
||||||
@ -38,4 +43,4 @@ USER root
|
|||||||
EXPOSE 9200 9300
|
EXPOSE 9200 9300
|
||||||
|
|
||||||
# 使用 supervisor 作为入口点
|
# 使用 supervisor 作为入口点
|
||||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
||||||
|
@ -10,17 +10,22 @@ ARG USE_INTRANET=false
|
|||||||
RUN if [ "$USE_INTRANET" = "true" ]; then \
|
RUN if [ "$USE_INTRANET" = "true" ]; then \
|
||||||
echo "Configuring intranet apt sources..." && \
|
echo "Configuring intranet apt sources..." && \
|
||||||
cp /etc/apt/sources.list /etc/apt/sources.list.bak && \
|
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-Peer "false";' > /etc/apt/apt.conf.d/99disable-ssl-check && \
|
||||||
echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \
|
echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 安装 supervisor
|
# 安装 supervisor, net-tools, vim
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y supervisor && \
|
apt-get install -y supervisor net-tools vim && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
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 日志目录
|
# 创建 supervisor 日志目录
|
||||||
RUN mkdir -p /var/log/supervisor
|
RUN mkdir -p /var/log/supervisor
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user