diff --git a/README.md b/README.md index 803cf64..a8c57b5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ app/ 部署编排:每个目录 = docker-compose.yml + install.sh / shutdown ### 使用约定 -- 所有自建镜像都基于 `kenaito:alinux3-update20261111` 构建,先构建基础镜像,再构建上层镜像 +- 所有自建镜像都基于 `kenaito:system-alinux3` 构建,先构建基础镜像,再构建上层镜像 - 镜像目录:`cd image/<目录> && sh build.sh`(构建并推送,镜像 tag 写在 `build.sh` 的 `IMAGE` 变量,与目录名一致) - 部署目录:`cd app/<目录> && sh install.sh`,`sh shutdown.sh` 停止;每个目录自洽,不依赖仓库其它层级 - 部署目录中使用的第三方镜像(MySQL、Nacos、Zookeeper、RocketMQ、EFK、SkyWalking 等)均同步到了 @@ -21,7 +21,7 @@ app/ 部署编排:每个目录 = docker-compose.yml + install.sh / shutdown | 目录 | 镜像 tag | 基础镜像 / 版本 | 说明 | | ------------------------------ | -------------------------------- | --------------------------------- | ------------------------------------------------------------------------ | -| `image/alinux3-update20261111` | `kenaito:alinux3-update20261111` | 阿里云 alinux3 3.13.3 | 系统基础镜像,其余镜像均基于它 | +| `image/system-alinux3` | `kenaito:system-alinux3` | 阿里云 alinux3 3.13.3 | 系统基础镜像,其余镜像均基于它 | | `image/runtime-jdk11` | `kenaito:runtime-jdk11` | 上者 / JDK 11 | 运行环境,仅 JDK | | `image/runtime-jdk17` | `kenaito:runtime-jdk17` | 上者 / JDK 17 | 运行环境,仅 JDK | | `image/runtime-jdk21` | `kenaito:runtime-jdk21` | 上者 / JDK 21.0.2 | 运行环境,仅 JDK | diff --git a/image/alinux3-update20261111/build.sh b/image/alinux3-update20261111/build.sh deleted file mode 100644 index ba256aa..0000000 --- a/image/alinux3-update20261111/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 -docker build -t "${IMAGE}" . -docker push "${IMAGE}" diff --git a/image/compile-dotnet6/Dockerfile b/image/compile-dotnet6/Dockerfile index 545c301..5f0832e 100644 --- a/image/compile-dotnet6/Dockerfile +++ b/image/compile-dotnet6/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/image/compile-dotnet8/Dockerfile b/image/compile-dotnet8/Dockerfile index 56806e4..58f1133 100644 --- a/image/compile-dotnet8/Dockerfile +++ b/image/compile-dotnet8/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/image/compile-dotnet9/Dockerfile b/image/compile-dotnet9/Dockerfile index 756319f..d51fbef 100644 --- a/image/compile-dotnet9/Dockerfile +++ b/image/compile-dotnet9/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/image/proxy-tengine3/Dockerfile b/image/proxy-tengine3/Dockerfile index 7f0ce9c..f324b34 100644 --- a/image/proxy-tengine3/Dockerfile +++ b/image/proxy-tengine3/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV TENGINE_VERSION=3.1.0 diff --git a/image/runtime-dotnet6/Dockerfile b/image/runtime-dotnet6/Dockerfile index fd120ef..d10231d 100644 --- a/image/runtime-dotnet6/Dockerfile +++ b/image/runtime-dotnet6/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/image/runtime-dotnet8/Dockerfile b/image/runtime-dotnet8/Dockerfile index a6d3581..e00149f 100644 --- a/image/runtime-dotnet8/Dockerfile +++ b/image/runtime-dotnet8/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/image/runtime-dotnet9/Dockerfile b/image/runtime-dotnet9/Dockerfile index 81a3594..8a4e149 100644 --- a/image/runtime-dotnet9/Dockerfile +++ b/image/runtime-dotnet9/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV DOTNET_HOME=/usr/local/dotnet diff --git a/image/runtime-jdk11/Dockerfile b/image/runtime-jdk11/Dockerfile index ec4b049..c31097a 100644 --- a/image/runtime-jdk11/Dockerfile +++ b/image/runtime-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV JAVA_HOME=/usr/local/java diff --git a/image/runtime-jdk17/Dockerfile b/image/runtime-jdk17/Dockerfile index b203a3f..b187450 100644 --- a/image/runtime-jdk17/Dockerfile +++ b/image/runtime-jdk17/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV JAVA_HOME=/usr/local/java diff --git a/image/runtime-jdk21/Dockerfile b/image/runtime-jdk21/Dockerfile index 38b44a5..b18da43 100644 --- a/image/runtime-jdk21/Dockerfile +++ b/image/runtime-jdk21/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV JAVA_HOME=/usr/local/java diff --git a/image/runtime-python3/Dockerfile b/image/runtime-python3/Dockerfile index 8ca4d4b..3ffbfc3 100644 --- a/image/runtime-python3/Dockerfile +++ b/image/runtime-python3/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV PYTHON_HOME=/usr/local/python3 diff --git a/image/alinux3-update20261111/Dockerfile b/image/system-alinux3/Dockerfile similarity index 100% rename from image/alinux3-update20261111/Dockerfile rename to image/system-alinux3/Dockerfile diff --git a/image/system-alinux3/build.sh b/image/system-alinux3/build.sh new file mode 100644 index 0000000..0ea4f6b --- /dev/null +++ b/image/system-alinux3/build.sh @@ -0,0 +1,3 @@ +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 +docker build -t "${IMAGE}" . +docker push "${IMAGE}" diff --git a/image/tools-ansible/Dockerfile b/image/tools-ansible/Dockerfile index 7b87c99..dae7e8a 100644 --- a/image/tools-ansible/Dockerfile +++ b/image/tools-ansible/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:alinux3-update20261111 +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3 LABEL MAINTAINER="tianjun@odboy.cn" ENV TimeZone=Asia/Shanghai ENV PYTHON_HOME=/usr/local/python3