From 46632479aa71f3653bd8adf8e11a57e33728a466 Mon Sep 17 00:00:00 2001 From: Odboy Date: Sat, 7 Jun 2025 21:57:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8B=86=E5=87=BA=20System=20?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=95=9C=E5=83=8F=EF=BC=8C=E5=85=B6=E4=BD=99?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E7=BB=9F=E4=B8=80=E5=9F=BA=E4=BA=8E=E5=AE=83?= =?UTF-8?q?=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 Base/Composite/binary 迁至顶层 System/,镜像改为 kenaito:alinux3-fix20261111 - Base/Compile、Base/Runtime、Base/Composite、Other 下 12 个 Dockerfile 的 FROM 改为该基础镜像 - README 增加 System 说明,移除已失效的 binary 语言条目 Signed-off-by: Odboy --- Base/Compile/dotnet6/Dockerfile | 2 +- Base/Compile/dotnet8/Dockerfile | 2 +- Base/Compile/dotnet9/Dockerfile | 2 +- Base/Composite/binary/build.sh | 3 --- Base/Composite/java11/Dockerfile | 2 +- Base/Composite/java17/Dockerfile | 2 +- Base/Composite/java21/Dockerfile | 2 +- Base/Composite/python3/Dockerfile | 2 +- Base/Runtime/dotnet6/Dockerfile | 2 +- Base/Runtime/dotnet8/Dockerfile | 2 +- Base/Runtime/dotnet9/Dockerfile | 2 +- Other/ansible/Dockerfile | 2 +- Other/nginx-tengine-3.1.0/Dockerfile | 2 +- README.md | 2 +- {Base/Composite/binary => System}/Dockerfile | 0 System/build.sh | 3 +++ 16 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 Base/Composite/binary/build.sh rename {Base/Composite/binary => System}/Dockerfile (100%) create mode 100644 System/build.sh diff --git a/Base/Compile/dotnet6/Dockerfile b/Base/Compile/dotnet6/Dockerfile index 387492f..83a34b4 100644 --- a/Base/Compile/dotnet6/Dockerfile +++ b/Base/Compile/dotnet6/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/Base/Compile/dotnet8/Dockerfile b/Base/Compile/dotnet8/Dockerfile index b1b25e2..89070ad 100644 --- a/Base/Compile/dotnet8/Dockerfile +++ b/Base/Compile/dotnet8/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/Base/Compile/dotnet9/Dockerfile b/Base/Compile/dotnet9/Dockerfile index dd5189b..ba12da9 100644 --- a/Base/Compile/dotnet9/Dockerfile +++ b/Base/Compile/dotnet9/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/Base/Composite/binary/build.sh b/Base/Composite/binary/build.sh deleted file mode 100644 index fd9f50a..0000000 --- a/Base/Composite/binary/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-alinux3 -docker build -t "${IMAGE}" . -docker push "${IMAGE}" diff --git a/Base/Composite/java11/Dockerfile b/Base/Composite/java11/Dockerfile index 32b346f..119bbf5 100644 --- a/Base/Composite/java11/Dockerfile +++ b/Base/Composite/java11/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV JAVA_HOME=/usr/local/java diff --git a/Base/Composite/java17/Dockerfile b/Base/Composite/java17/Dockerfile index f15f288..bc45321 100644 --- a/Base/Composite/java17/Dockerfile +++ b/Base/Composite/java17/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV JAVA_HOME=/usr/local/java diff --git a/Base/Composite/java21/Dockerfile b/Base/Composite/java21/Dockerfile index 1a49cfa..2fe7057 100644 --- a/Base/Composite/java21/Dockerfile +++ b/Base/Composite/java21/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV JAVA_HOME=/usr/local/java diff --git a/Base/Composite/python3/Dockerfile b/Base/Composite/python3/Dockerfile index 274583c..bf69bb3 100644 --- a/Base/Composite/python3/Dockerfile +++ b/Base/Composite/python3/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV PYTHON_HOME=/usr/local/python3 diff --git a/Base/Runtime/dotnet6/Dockerfile b/Base/Runtime/dotnet6/Dockerfile index 46ab743..a6b3367 100644 --- a/Base/Runtime/dotnet6/Dockerfile +++ b/Base/Runtime/dotnet6/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/Base/Runtime/dotnet8/Dockerfile b/Base/Runtime/dotnet8/Dockerfile index 76efe34..f9d6169 100644 --- a/Base/Runtime/dotnet8/Dockerfile +++ b/Base/Runtime/dotnet8/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/Base/Runtime/dotnet9/Dockerfile b/Base/Runtime/dotnet9/Dockerfile index 833d1cd..4357311 100644 --- a/Base/Runtime/dotnet9/Dockerfile +++ b/Base/Runtime/dotnet9/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/Other/ansible/Dockerfile b/Other/ansible/Dockerfile index 8bc2201..b7f28d7 100644 --- a/Other/ansible/Dockerfile +++ b/Other/ansible/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV PYTHON_HOME=/usr/local/python3 diff --git a/Other/nginx-tengine-3.1.0/Dockerfile b/Other/nginx-tengine-3.1.0/Dockerfile index 07e4118..bfbc8fd 100644 --- a/Other/nginx-tengine-3.1.0/Dockerfile +++ b/Other/nginx-tengine-3.1.0/Dockerfile @@ -1,4 +1,4 @@ -FROM alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3:220901.1 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV TENGINE_VERSION=3.1.0 diff --git a/README.md b/README.md index e634473..1a3a947 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ 应用环境镜像定制 # 目录说明 +- System 系统基础镜像(alinux3 修补版,其它镜像均基于它构建) - Base - Compile 编译环境 - Runtime 运行环境 @@ -23,7 +24,6 @@ # 支持的语言 -- binary 适用于amd64位二进制可执行程序 - dotnet 适用于dotnet应用 - java 适用于java应用 - python 适用于python应用 \ No newline at end of file diff --git a/Base/Composite/binary/Dockerfile b/System/Dockerfile similarity index 100% rename from Base/Composite/binary/Dockerfile rename to System/Dockerfile diff --git a/System/build.sh b/System/build.sh new file mode 100644 index 0000000..aad4501 --- /dev/null +++ b/System/build.sh @@ -0,0 +1,3 @@ +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-fix20261111 +docker build -t "${IMAGE}" . +docker push "${IMAGE}"