From dd830289485163c4971985efb19efa9120a2397c Mon Sep 17 00:00:00 2001 From: Odboy Date: Sat, 31 May 2025 21:26:57 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E7=BB=9F=E4=B8=80=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=95=9C=E5=83=8F=E4=BB=93=E5=BA=93=E5=B9=B6?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 所有 build.sh 镜像名前缀统一为 registry.cn-shanghai.aliyuncs.com/odboy/kenaito - tag 改为 <分类>-<名称>:compile-dotnet6/8/9、runtime-dotnet6/8/9、 runtime-alinux3、runtime-jdk11/17/21、runtime-python3、tools-ansible、proxy-tengine3 - 使用 IMAGE 变量避免重复书写,build 后追加 docker push Signed-off-by: Odboy --- Base/Compile/dotnet6/build.sh | 4 +++- Base/Compile/dotnet8/build.sh | 4 +++- Base/Compile/dotnet9/build.sh | 4 +++- Base/Composite/binary/build.sh | 4 +++- Base/Composite/java11/build.sh | 4 +++- Base/Composite/java17/build.sh | 4 +++- Base/Composite/java21/build.sh | 4 +++- Base/Composite/python3/build.sh | 5 +++-- Base/Runtime/dotnet6/build.sh | 4 +++- Base/Runtime/dotnet8/build.sh | 4 +++- Base/Runtime/dotnet9/build.sh | 4 +++- Other/ansible/build.sh | 4 +++- Other/nginx-tengine-3.1.0/build.sh | 4 +++- 13 files changed, 39 insertions(+), 14 deletions(-) diff --git a/Base/Compile/dotnet6/build.sh b/Base/Compile/dotnet6/build.sh index 6ab7bb6..cab6543 100644 --- a/Base/Compile/dotnet6/build.sh +++ b/Base/Compile/dotnet6/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-compile:dotnet6 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-dotnet6 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Compile/dotnet8/build.sh b/Base/Compile/dotnet8/build.sh index 2c689b6..2d10d30 100644 --- a/Base/Compile/dotnet8/build.sh +++ b/Base/Compile/dotnet8/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-compile:dotnet8 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-dotnet8 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Compile/dotnet9/build.sh b/Base/Compile/dotnet9/build.sh index 3f7c1de..86bd8ea 100644 --- a/Base/Compile/dotnet9/build.sh +++ b/Base/Compile/dotnet9/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-compile:dotnet9 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-dotnet9 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Composite/binary/build.sh b/Base/Composite/binary/build.sh index ff3816c..fd9f50a 100644 --- a/Base/Composite/binary/build.sh +++ b/Base/Composite/binary/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-runtime:alinux3 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-alinux3 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Composite/java11/build.sh b/Base/Composite/java11/build.sh index 66cfc8c..2ee6d93 100644 --- a/Base/Composite/java11/build.sh +++ b/Base/Composite/java11/build.sh @@ -4,4 +4,6 @@ rm -f openjdk-11.0.2_linux-x64_bin.tar.gz rm -f jdk-11.0.2/lib/src.zip tar -czvf jdk-11.0.2.tar.gz jdk-11.0.2 rm -rf jdk-11.0.2 -docker build -t kenaito-runtime:jdk11 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk11 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Composite/java17/build.sh b/Base/Composite/java17/build.sh index d2daae5..852ae76 100644 --- a/Base/Composite/java17/build.sh +++ b/Base/Composite/java17/build.sh @@ -4,4 +4,6 @@ rm -f openjdk-17.0.2_linux-x64_bin.tar.gz rm -f jdk-17.0.2/lib/src.zip tar -czvf jdk-17.0.2.tar.gz jdk-17.0.2 rm -rf jdk-17.0.2 -docker build -t kenaito-runtime:jdk17 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk17 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Composite/java21/build.sh b/Base/Composite/java21/build.sh index 95bcde0..5247d7a 100644 --- a/Base/Composite/java21/build.sh +++ b/Base/Composite/java21/build.sh @@ -4,4 +4,6 @@ rm -f openjdk-21.0.2_linux-x64_bin.tar.gz rm -f jdk-21.0.2/lib/src.zip tar -czvf jdk-21.0.2.tar.gz jdk-21.0.2 rm -rf jdk-21.0.2 -docker build -t kenaito-runtime:jdk21 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk21 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Composite/python3/build.sh b/Base/Composite/python3/build.sh index bc9f3a9..bdfb524 100644 --- a/Base/Composite/python3/build.sh +++ b/Base/Composite/python3/build.sh @@ -1,2 +1,3 @@ -#./configure --enable-optimizations --with-ssl --prefix=/usr/local/python3 -docker build -t kenaito-runtime:python3 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-python3 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Runtime/dotnet6/build.sh b/Base/Runtime/dotnet6/build.sh index 0cd9954..fa8caa2 100644 --- a/Base/Runtime/dotnet6/build.sh +++ b/Base/Runtime/dotnet6/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-runtime:dotnet6 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-dotnet6 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Runtime/dotnet8/build.sh b/Base/Runtime/dotnet8/build.sh index 4c27e51..bdcd6f0 100644 --- a/Base/Runtime/dotnet8/build.sh +++ b/Base/Runtime/dotnet8/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-runtime:dotnet8 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-dotnet8 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Base/Runtime/dotnet9/build.sh b/Base/Runtime/dotnet9/build.sh index f943f01..cac9c26 100644 --- a/Base/Runtime/dotnet9/build.sh +++ b/Base/Runtime/dotnet9/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-runtime:dotnet9 . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-dotnet9 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Other/ansible/build.sh b/Other/ansible/build.sh index 5941515..61a199e 100644 --- a/Other/ansible/build.sh +++ b/Other/ansible/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-host-control:ansible . \ No newline at end of file +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:tools-ansible +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/Other/nginx-tengine-3.1.0/build.sh b/Other/nginx-tengine-3.1.0/build.sh index d01b12c..6e6089f 100755 --- a/Other/nginx-tengine-3.1.0/build.sh +++ b/Other/nginx-tengine-3.1.0/build.sh @@ -1 +1,3 @@ -docker build -t kenaito-middleware:nginx-tengine-3.1.0 . +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:proxy-tengine3 +docker build -t "${IMAGE}" . +docker push "${IMAGE}"