refactor: tengine/python 镜像改为 build.sh 预下载源码包,移除远程 ADD

- proxy-tengine3、runtime-python3、tools-ansible:ADD 改成本地文件名,
  源码包由 build.sh 先下载(已存在则复用),避免每次构建都拉外网且不受层缓存保护
- build.sh 加 shebang、set -euo pipefail,并 cd 到脚本所在目录,加可执行权限
- 三个目录新增 .dockerignore(不忽略源码包,ADD 源文件需在构建上下文内)与 .gitignore
- runtime-jdk11/17/21 的 build.sh 已是预下载+解包流程,本次不动
This commit is contained in:
2025-11-29 21:34:59 +08:00
parent c9ead5f038
commit 6430246299
12 changed files with 69 additions and 3 deletions
+5
View File
@@ -0,0 +1,5 @@
# 由 build.sh 预下载的 tengine 源码包经 ADD 解压进镜像,
# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略
build.sh
.git/
.DS_Store
+3
View File
@@ -0,0 +1,3 @@
# 构建产物 / 本地缓存
*.tar.gz
.DS_Store
+3 -1
View File
@@ -8,7 +8,9 @@ WORKDIR /home/admin
# 使用自定义配置覆盖默认可映射的目录:conf/nginx.conf、conf/conf.d、conf/ssl # 使用自定义配置覆盖默认可映射的目录:conf/nginx.conf、conf/conf.d、conf/ssl
COPY nginx.conf ${NGINX_HOME}/conf/nginx.conf COPY nginx.conf ${NGINX_HOME}/conf/nginx.conf
# https://tengine.taobao.org/download/tengine-3.1.0.tar.gz # https://tengine.taobao.org/download/tengine-3.1.0.tar.gz
ADD https://tengine.taobao.org/download/tengine-${TENGINE_VERSION}.tar.gz ./ # 由 build.sh 预先下载到本目录
ADD tengine-${TENGINE_VERSION}.tar.gz ./
# gcc/gcc-c++/make 用于编译 tengine;sysstat/net-tools 用于排障
RUN yum install \ RUN yum install \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
+12
View File
@@ -1,3 +1,15 @@
#!/usr/bin/env bash
# 先下载 tengine 源码包到当前目录,再基于本地文件构建镜像
set -euo pipefail
cd "$(dirname "$0")"
TENGINE=tengine-3.1.0.tar.gz
URL=https://tengine.taobao.org/download/tengine-3.1.0.tar.gz
if [ ! -f "${TENGINE}" ]; then
curl -fL -o "${TENGINE}" "${URL}"
fi
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:proxy-tengine3 IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:proxy-tengine3
docker build -t "${IMAGE}" . docker build -t "${IMAGE}" .
docker push "${IMAGE}" docker push "${IMAGE}"
+5
View File
@@ -0,0 +1,5 @@
# 由 build.sh 预下载的 Python 源码包经 ADD 解压进镜像,
# ADD 的源文件必须在构建上下文内,因此 *.tgz 不能在这里忽略
build.sh
.git/
.DS_Store
+3
View File
@@ -0,0 +1,3 @@
# 构建产物 / 本地缓存
*.tgz
.DS_Store
+3 -1
View File
@@ -4,7 +4,9 @@ ENV TimeZone=Asia/Shanghai
ENV PYTHON_HOME=/usr/local/python3 ENV PYTHON_HOME=/usr/local/python3
ENV PATH="${PYTHON_HOME}/bin:$PATH" ENV PATH="${PYTHON_HOME}/bin:$PATH"
WORKDIR /home/admin WORKDIR /home/admin
ADD https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz ./ # https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz
# 由 build.sh 预先下载到本目录
ADD Python-3.10.0.tgz ./
RUN yum install \ RUN yum install \
libffi-devel \ libffi-devel \
zlib-devel \ zlib-devel \
Regular → Executable
+12
View File
@@ -1,3 +1,15 @@
#!/usr/bin/env bash
# 先下载 Python 源码包到当前目录,再基于本地文件构建镜像
set -euo pipefail
cd "$(dirname "$0")"
PYTHON=Python-3.10.0.tgz
URL=https://www.python.org/ftp/python/3.10.0/${PYTHON}
if [ ! -f "${PYTHON}" ]; then
curl -fL -o "${PYTHON}" "${URL}"
fi
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-python3 IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-python3
docker build -t "${IMAGE}" . docker build -t "${IMAGE}" .
docker push "${IMAGE}" docker push "${IMAGE}"
+5
View File
@@ -0,0 +1,5 @@
# 由 build.sh 预下载的 Python 源码包经 ADD 解压进镜像,
# ADD 的源文件必须在构建上下文内,因此 *.tgz 不能在这里忽略
build.sh
.git/
.DS_Store
+3
View File
@@ -0,0 +1,3 @@
# 构建产物 / 本地缓存
*.tgz
.DS_Store
+3 -1
View File
@@ -4,7 +4,9 @@ ENV TimeZone=Asia/Shanghai
ENV PYTHON_HOME=/usr/local/python3 ENV PYTHON_HOME=/usr/local/python3
ENV PATH="${PYTHON_HOME}/bin:$PATH" ENV PATH="${PYTHON_HOME}/bin:$PATH"
WORKDIR /home/admin WORKDIR /home/admin
ADD https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz ./ # https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz
# 由 build.sh 预先下载到本目录
ADD Python-3.10.0.tgz ./
RUN yum install \ RUN yum install \
libffi-devel \ libffi-devel \
zlib-devel \ zlib-devel \
Regular → Executable
+12
View File
@@ -1,3 +1,15 @@
#!/usr/bin/env bash
# 先下载 Python 源码包到当前目录,再基于本地文件构建镜像
set -euo pipefail
cd "$(dirname "$0")"
PYTHON=Python-3.10.0.tgz
URL=https://www.python.org/ftp/python/3.10.0/${PYTHON}
if [ ! -f "${PYTHON}" ]; then
curl -fL -o "${PYTHON}" "${URL}"
fi
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:tools-ansible IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:tools-ansible
docker build -t "${IMAGE}" . docker build -t "${IMAGE}" .
docker push "${IMAGE}" docker push "${IMAGE}"