diff --git a/README.md b/README.md index f954ce8..a5229f1 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,16 @@ ``` image/ 自建镜像:每个目录 = Dockerfile + build.sh,目录名即镜像 tag -app/ 部署编排:每个目录 = docker-compose.yml + install.sh / shutdown.sh + run.md(+demo.png) +app/ 部署编排:每个目录 = docker-compose.yml + startup.sh / shutdown.sh + run.md(+demo.png) app/ansible 例外:基于 runtime-python310 构建 ansible 镜像 -demo/ 构建示例:演示如何基于 image/ 下的镜像做两阶段构建(dotnet6 / dotnet8 / dotnet9) +demo/ 构建示例:基于 image/ 下的镜像做两阶段构建(dotnet6 / dotnet8 / dotnet9),以及 tengine 反向代理示例 ``` ### 使用约定 - 所有自建镜像都基于 `kenaito:system-alinux3` 构建,先构建基础镜像,再构建上层镜像 - 镜像目录:`cd image/<目录> && sh build.sh`(构建并推送,镜像 tag 写在 `build.sh` 的 `IMAGE` 变量,与目录名一致) -- 部署目录:`cd app/<目录> && sh install.sh`,`sh shutdown.sh` 停止;每个目录自洽,不依赖仓库其它层级 +- 部署目录:`cd app/<目录> && sh startup.sh`,`sh shutdown.sh` 停止;每个目录自洽,不依赖仓库其它层级 - 部署目录中使用的第三方镜像(MySQL、Nacos、Zookeeper、RocketMQ、EFK、SkyWalking 等)均同步到了 `registry.cn-shanghai.aliyuncs.com/odboy/<原名>:<版本>`,注释里保留原镜像名 @@ -64,10 +64,19 @@ demo/ 构建示例:演示如何基于 image/ 下的镜像做两阶段构建 | [`app/skywalking-10.0.1-es`](app/skywalking-10.0.1-es/run.md) | SkyWalking OAP / UI 10.0.1 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | | [`app/skywalking-10.0.1-mysql`](app/skywalking-10.0.1-mysql/run.md) | SkyWalking OAP / UI 10.0.1 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | | [`app/skywalking-10.0.1-agent`](app/skywalking-10.0.1-agent/README.md) | SkyWalking Java Agent 9.3.0 | - | 应用接入 agent 包(仅 `*.tgz`,无编排) | -| [`app/tengine-3.1.0`](app/tengine-3.1.0/run.md) | Tengine 3.1.0(`proxy-tengine3` 镜像) | 80、443 | 反代示例,证书与站点配置挂载目录 | 同版本的 ES / MySQL / Agent 三种形态目录并列,按需选择其一部署;ES 形态与 MySQL 形态端口相同,不要同时启动。 +### 构建示例 + +| 目录 | 基础镜像 | 端口 | 说明 | +| ------------------------------------------- | ---------------------------------- | ------------- | ---------------------------------------------------------- | +| [`demo/dotnet6`](demo/dotnet6/README.md) | `compile-dotnet6` / `runtime-dotnet6` | 8080 | .NET 6 两阶段构建示例 | +| [`demo/dotnet8`](demo/dotnet8/README.md) | `compile-dotnet8` / `runtime-dotnet8` | 8081 | .NET 8 两阶段构建示例 | +| [`demo/dotnet9`](demo/dotnet9/README.md) | `compile-dotnet9` / `runtime-dotnet9` | 8082 | .NET 9 两阶段构建示例 | +| [`demo/tengine3`](demo/tengine3/run.md) | `proxy-tengine3` | 80、443 | Tengine 3.1.0 反向代理示例,证书与站点配置挂载目录 | + + # 支持的语言 - dotnet 适用于 dotnet 应用 - 编译:`runtime-dotnet*` 之上的 `compile-dotnet*` diff --git a/app/tengine-3.1.0/.gitignore b/demo/tengine3/.gitignore similarity index 100% rename from app/tengine-3.1.0/.gitignore rename to demo/tengine3/.gitignore diff --git a/app/tengine-3.1.0/docker-compose.yml b/demo/tengine3/docker-compose.yml similarity index 91% rename from app/tengine-3.1.0/docker-compose.yml rename to demo/tengine3/docker-compose.yml index 460f853..77e4de0 100644 --- a/app/tengine-3.1.0/docker-compose.yml +++ b/demo/tengine3/docker-compose.yml @@ -9,9 +9,9 @@ networks: - subnet: "172.25.0.0/24" services: - tengine: + tengine3: image: registry.cn-shanghai.aliyuncs.com/odboy/kenaito:proxy-tengine3 # 镜像由 build.sh 构建 - container_name: tengine # 容器名为'tengine' + container_name: tengine3 # 容器名为'tengine3' restart: unless-stopped ports: # 映射端口 - "80:80" # http diff --git a/app/tengine-3.1.0/nginx/conf.d/demo.odboy.cn.conf b/demo/tengine3/nginx/conf.d/demo.odboy.cn.conf similarity index 100% rename from app/tengine-3.1.0/nginx/conf.d/demo.odboy.cn.conf rename to demo/tengine3/nginx/conf.d/demo.odboy.cn.conf diff --git a/app/tengine-3.1.0/nginx/html/index.html b/demo/tengine3/nginx/html/index.html similarity index 100% rename from app/tengine-3.1.0/nginx/html/index.html rename to demo/tengine3/nginx/html/index.html diff --git a/app/tengine-3.1.0/nginx/logs/.gitignore b/demo/tengine3/nginx/logs/.gitignore similarity index 100% rename from app/tengine-3.1.0/nginx/logs/.gitignore rename to demo/tengine3/nginx/logs/.gitignore diff --git a/app/tengine-3.1.0/nginx/ssl/.gitignore b/demo/tengine3/nginx/ssl/.gitignore similarity index 100% rename from app/tengine-3.1.0/nginx/ssl/.gitignore rename to demo/tengine3/nginx/ssl/.gitignore diff --git a/app/tengine-3.1.0/run.md b/demo/tengine3/run.md similarity index 96% rename from app/tengine-3.1.0/run.md rename to demo/tengine3/run.md index a0e8f45..f5d2b96 100644 --- a/app/tengine-3.1.0/run.md +++ b/demo/tengine3/run.md @@ -23,10 +23,10 @@ ```shell docker build -t registry.cn-shanghai.aliyuncs.com/odboy/kenaito:proxy-tengine3 . -sh install.sh +sh startup.sh ``` -等同:`docker-compose -f docker-compose.yml -p tengine up -d` +等同:`docker-compose -f docker-compose.yml -p tengine3 up -d` 访问 http://192.168.235.104 (http 80)、https://192.168.235.104 (https 443), 如 `demo.odboy.cn` 已解析到该机器,可用 `-H "Host: demo.odboy.cn"` 或直接访问域名 diff --git a/app/tengine-3.1.0/shutdown.sh b/demo/tengine3/shutdown.sh similarity index 100% rename from app/tengine-3.1.0/shutdown.sh rename to demo/tengine3/shutdown.sh diff --git a/app/tengine-3.1.0/install.sh b/demo/tengine3/startup.sh similarity index 100% rename from app/tengine-3.1.0/install.sh rename to demo/tengine3/startup.sh