diff --git a/README.md b/README.md index 2248688..1854adf 100644 --- a/README.md +++ b/README.md @@ -3,63 +3,62 @@ 应用环境镜像定制(alinux3)与中间件部署编排。镜像仓库:`registry.cn-shanghai.aliyuncs.com/odboy/` ``` -top/ -├── image/ 自建镜像:每个目录 = Dockerfile + build.sh,目录名即镜像 tag -└── app/ 部署编排:每个目录 = docker-compose.yml + install.sh / shutdown.sh + run.md(+demo.png) +image/ 自建镜像:每个目录 = Dockerfile + build.sh,目录名即镜像 tag +app/ 部署编排:每个目录 = docker-compose.yml + install.sh / shutdown.sh + run.md(+demo.png) ``` ### 使用约定 - 所有自建镜像都基于 `kenaito:alinux3-update20261111` 构建,先构建基础镜像,再构建上层镜像 -- 镜像目录:`cd top/image/<目录> && sh build.sh`(构建并推送,镜像 tag 写在 `build.sh` 的 `IMAGE` 变量,与目录名一致) -- 部署目录:`cd top/app/<目录> && sh install.sh`,`sh shutdown.sh` 停止;每个目录自洽,不依赖仓库其它层级 +- 镜像目录:`cd image/<目录> && sh build.sh`(构建并推送,镜像 tag 写在 `build.sh` 的 `IMAGE` 变量,与目录名一致) +- 部署目录:`cd app/<目录> && sh install.sh`,`sh shutdown.sh` 停止;每个目录自洽,不依赖仓库其它层级 - 部署目录中使用的第三方镜像(MySQL、Nacos、Zookeeper、RocketMQ、EFK、SkyWalking 等)均同步到了 `registry.cn-shanghai.aliyuncs.com/odboy/<原名>:<版本>`,注释里保留原镜像名 ### 自建镜像 -| 目录 | 镜像 tag | 基础镜像 / 版本 | 说明 | -|-----------------------------------------|------------------------------|--------------------------------|--------------------------------------------| -| `top/image/alinux3-update20261111` | `kenaito:alinux3-update20261111` | 阿里云 alinux3 3.13.3 | 系统基础镜像,其余镜像均基于它 | -| `top/image/runtime-jdk11` | `kenaito:runtime-jdk11` | 上者 / JDK 11 | 运行环境,仅 JDK | -| `top/image/runtime-jdk17` | `kenaito:runtime-jdk17` | 上者 / JDK 17 | 运行环境,仅 JDK | -| `top/image/runtime-jdk21` | `kenaito:runtime-jdk21` | 上者 / JDK 21.0.2 | 运行环境,仅 JDK | -| `top/image/runtime-python3` | `kenaito:runtime-python3` | 上者 / Python 3.10.0 | 运行环境,Python + pip 源(`pip.conf`) | -| `top/image/runtime-dotnet6` | `kenaito:runtime-dotnet6` | 上者 / ASP.NET Core 运行时 6.0.35 | 运行环境,仅运行时 | -| `top/image/runtime-dotnet8` | `kenaito:runtime-dotnet8` | 上者 / ASP.NET Core 运行时 8.0.x | 运行环境,仅运行时 | -| `top/image/runtime-dotnet9` | `kenaito:runtime-dotnet9` | 上者 / ASP.NET Core 运行时 9.0.x | 运行环境,仅运行时 | -| `top/image/compile-dotnet6` | `kenaito:compile-dotnet6` | 上者 / .NET SDK 6.0.427 | 编译环境(SDK + 编译工具链),附两阶段构建示例 `demo/` | -| `top/image/compile-dotnet8` | `kenaito:compile-dotnet8` | 上者 / .NET SDK 8.0.403 | 编译环境(SDK + 编译工具链) | -| `top/image/compile-dotnet9` | `kenaito:compile-dotnet9` | 上者 / .NET SDK 9.0.100-rc.2 | 编译环境(SDK + 编译工具链) | -| `top/image/proxy-tengine3` | `kenaito:proxy-tengine3` | 上者 / Tengine 3.1.0 源码编译 | 反向代理 / Web 服务器,自定义 `nginx.conf` | -| `top/image/tools-ansible` | `kenaito:tools-ansible` | 上者 / Python 3.10.0 + Ansible | 运维工具镜像 | +| 目录 | 镜像 tag | 基础镜像 / 版本 | 说明 | +| ------------------------------ | -------------------------------- | --------------------------------- | ------------------------------------------------------ | +| `image/alinux3-update20261111` | `kenaito:alinux3-update20261111` | 阿里云 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 | +| `image/runtime-python3` | `kenaito:runtime-python3` | 上者 / Python 3.10.0 | 运行环境,Python + pip 源(`pip.conf`) | +| `image/runtime-dotnet6` | `kenaito:runtime-dotnet6` | 上者 / ASP.NET Core 运行时 6.0.35 | 运行环境,仅运行时 | +| `image/runtime-dotnet8` | `kenaito:runtime-dotnet8` | 上者 / ASP.NET Core 运行时 8.0.x | 运行环境,仅运行时 | +| `image/runtime-dotnet9` | `kenaito:runtime-dotnet9` | 上者 / ASP.NET Core 运行时 9.0.x | 运行环境,仅运行时 | +| `image/compile-dotnet6` | `kenaito:compile-dotnet6` | 上者 / .NET SDK 6.0.427 | 编译环境(SDK + 编译工具链),附两阶段构建示例 `demo/` | +| `image/compile-dotnet8` | `kenaito:compile-dotnet8` | 上者 / .NET SDK 8.0.403 | 编译环境(SDK + 编译工具链) | +| `image/compile-dotnet9` | `kenaito:compile-dotnet9` | 上者 / .NET SDK 9.0.100-rc.2 | 编译环境(SDK + 编译工具链) | +| `image/proxy-tengine3` | `kenaito:proxy-tengine3` | 上者 / Tengine 3.1.0 源码编译 | 反向代理 / Web 服务器,自定义 `nginx.conf` | +| `image/tools-ansible` | `kenaito:tools-ansible` | 上者 / Python 3.10.0 + Ansible | 运维工具镜像 | ### 部署编排 -| 目录 | 组件与版本 | 端口 | 说明 / 依赖 | -|-------------------------------------------|--------------------------------------|-------------------------------------|---------------------------------| -| `top/app/nacos-2.5.0-standalone` | Nacos 2.5.0 + MySQL 8.0 | 8848、9848、3308 | 单机 Nacos,MySQL 存储,含建库脚本 | -| `top/app/nacos-2.5.0-cluster` | Nacos 2.5.0 ×3 + MySQL 8.0 | 8848-8850、9848-9849、7850、3308 | 三节点集群,MySQL 存储 | -| `top/app/dubbo-admin-0.6.0-standalone` | Dubbo Admin 0.6.0 + Zookeeper 3.9.3 | 38080、2181 | 单机 Dubbo 管控台 | -| `top/app/dubbo-admin-0.6.0-cluster` | Dubbo Admin 0.6.0 + Zookeeper 3.9.3 ×3 | 38080、2181-2183 | Zookeeper 三节点集群 | -| `top/app/zookeeper-3.8.4-standalone` | Zookeeper 3.8.4 | 2181 | 单机 | -| `top/app/zookeeper-3.8.4-cluster` | Zookeeper 3.8.4 ×3 | 2181-2183 | 三节点集群 | -| `top/app/zookeeper-3.9.3-standalone` | Zookeeper 3.9.3 | 2181 | 单机 | -| `top/app/zookeeper-3.9.3-cluster` | Zookeeper 3.9.3 ×3 | 2181-2183 | 三节点集群 | -| `top/app/rocketmq-4.9.6-standalone` | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Namesrv + 单 Broker | -| `top/app/rocketmq-4.9.6-cluster-1m2s` | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Master + 双 Slave | -| `top/app/rocketmq-4.9.6-cluster-2m` | RocketMQ 4.9.6 | 9876、10709-10712 | 双 Master(无 Slave) | -| `top/app/efk` | Elasticsearch / Kibana / Filebeat 7.14.1 | 9200、9300、5601 | 日志采集 + 搜索 + 展示,含 ik 分词 | -| `top/app/skywalking-9.5.0-es` | SkyWalking OAP / UI 9.5.0 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | -| `top/app/skywalking-9.5.0-mysql` | SkyWalking OAP / UI 9.5.0 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | -| `top/app/skywalking-9.7.0-es` | SkyWalking OAP / UI 9.7.0 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | -| `top/app/skywalking-9.7.0-mysql` | SkyWalking OAP / UI 9.7.0 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | -| `top/app/skywalking-10.0.1-es` | SkyWalking OAP / UI 10.0.1 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | -| `top/app/skywalking-10.0.1-mysql` | SkyWalking OAP / UI 10.0.1 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | -| `top/app/skywalking-9.5.0-agent` | SkyWalking Java Agent 8.15.0 | - | 应用接入 agent 包(仅 `*.tgz`,无编排) | -| `top/app/skywalking-9.7.0-agent` | SkyWalking Java Agent 9.1.0 | - | 应用接入 agent 包(仅 `*.tgz`,无编排) | -| `top/app/skywalking-10.0.1-agent` | SkyWalking Java Agent 9.3.0 | - | 应用接入 agent 包(仅 `*.tgz`,无编排) | -| `top/app/tengine-3.1.0` | Tengine 3.1.0(`proxy-tengine3` 镜像) | 80、443 | 反代示例,证书与站点配置挂载目录 | +| 目录 | 组件与版本 | 端口 | 说明 / 依赖 | +| ---------------------------------- | ---------------------------------------- | --------------------------------- | ------------------------------------------------------ | +| `app/nacos-2.5.0-standalone` | Nacos 2.5.0 + MySQL 8.0 | 8848、9848、3308 | 单机 Nacos,MySQL 存储,含建库脚本 | +| `app/nacos-2.5.0-cluster` | Nacos 2.5.0 ×3 + MySQL 8.0 | 8848-8850、9848-9849、7850、3308 | 三节点集群,MySQL 存储 | +| `app/dubbo-admin-0.6.0-standalone` | Dubbo Admin 0.6.0 + Zookeeper 3.9.3 | 38080、2181 | 单机 Dubbo 管控台 | +| `app/dubbo-admin-0.6.0-cluster` | Dubbo Admin 0.6.0 + Zookeeper 3.9.3 ×3 | 38080、2181-2183 | Zookeeper 三节点集群 | +| `app/zookeeper-3.8.4-standalone` | Zookeeper 3.8.4 | 2181 | 单机 | +| `app/zookeeper-3.8.4-cluster` | Zookeeper 3.8.4 ×3 | 2181-2183 | 三节点集群 | +| `app/zookeeper-3.9.3-standalone` | Zookeeper 3.9.3 | 2181 | 单机 | +| `app/zookeeper-3.9.3-cluster` | Zookeeper 3.9.3 ×3 | 2181-2183 | 三节点集群 | +| `app/rocketmq-4.9.6-standalone` | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Namesrv + 单 Broker | +| `app/rocketmq-4.9.6-cluster-1m2s` | RocketMQ 4.9.6 + Dashboard | 9876、10909-10912 | 单 Master + 双 Slave | +| `app/rocketmq-4.9.6-cluster-2m` | RocketMQ 4.9.6 | 9876、10709-10712 | 双 Master(无 Slave) | +| `app/efk` | Elasticsearch / Kibana / Filebeat 7.14.1 | 9200、9300、5601 | 日志采集 + 搜索 + 展示,含 ik 分词 | +| `app/skywalking-9.5.0-es` | SkyWalking OAP / UI 9.5.0 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | +| `app/skywalking-9.5.0-mysql` | SkyWalking OAP / UI 9.5.0 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | +| `app/skywalking-9.7.0-es` | SkyWalking OAP / UI 9.7.0 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | +| `app/skywalking-9.7.0-mysql` | SkyWalking OAP / UI 9.7.0 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | +| `app/skywalking-10.0.1-es` | SkyWalking OAP / UI 10.0.1 + ES 7.14.1 | 11800、12800、18080、9200、9300 | 链路追踪,ES 存储 | +| `app/skywalking-10.0.1-mysql` | SkyWalking OAP / UI 10.0.1 + MySQL 8.0 | 11800、12800、18080、3308 | 链路追踪,MySQL 存储 | +| `app/skywalking-9.5.0-agent` | SkyWalking Java Agent 8.15.0 | - | 应用接入 agent 包(仅 `*.tgz`,无编排) | +| `app/skywalking-9.7.0-agent` | SkyWalking Java Agent 9.1.0 | - | 应用接入 agent 包(仅 `*.tgz`,无编排) | +| `app/skywalking-10.0.1-agent` | SkyWalking Java Agent 9.3.0 | - | 应用接入 agent 包(仅 `*.tgz`,无编排) | +| `app/tengine-3.1.0` | Tengine 3.1.0(`proxy-tengine3` 镜像) | 80、443 | 反代示例,证书与站点配置挂载目录 | 每个目录下的 `run.md` 有详细的部署命令、访问地址与示例图,完整索引见 [docs/index.md](docs/index.md)。 diff --git a/top/app/dubbo-admin-0.6.0-cluster/demo.png b/app/dubbo-admin-0.6.0-cluster/demo.png similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/demo.png rename to app/dubbo-admin-0.6.0-cluster/demo.png diff --git a/top/app/dubbo-admin-0.6.0-cluster/docker-compose.yml b/app/dubbo-admin-0.6.0-cluster/docker-compose.yml similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/docker-compose.yml rename to app/dubbo-admin-0.6.0-cluster/docker-compose.yml diff --git a/top/app/dubbo-admin-0.6.0-cluster/dubbo-admin/config/application.properties b/app/dubbo-admin-0.6.0-cluster/dubbo-admin/config/application.properties similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/dubbo-admin/config/application.properties rename to app/dubbo-admin-0.6.0-cluster/dubbo-admin/config/application.properties diff --git a/top/app/dubbo-admin-0.6.0-cluster/install.sh b/app/dubbo-admin-0.6.0-cluster/install.sh similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/install.sh rename to app/dubbo-admin-0.6.0-cluster/install.sh diff --git a/top/app/dubbo-admin-0.6.0-cluster/run.md b/app/dubbo-admin-0.6.0-cluster/run.md similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/run.md rename to app/dubbo-admin-0.6.0-cluster/run.md diff --git a/top/app/dubbo-admin-0.6.0-cluster/shutdown.sh b/app/dubbo-admin-0.6.0-cluster/shutdown.sh similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/shutdown.sh rename to app/dubbo-admin-0.6.0-cluster/shutdown.sh diff --git a/top/app/dubbo-admin-0.6.0-cluster/zookeeper1/zoo.cfg b/app/dubbo-admin-0.6.0-cluster/zookeeper1/zoo.cfg similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/zookeeper1/zoo.cfg rename to app/dubbo-admin-0.6.0-cluster/zookeeper1/zoo.cfg diff --git a/top/app/dubbo-admin-0.6.0-cluster/zookeeper2/zoo.cfg b/app/dubbo-admin-0.6.0-cluster/zookeeper2/zoo.cfg similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/zookeeper2/zoo.cfg rename to app/dubbo-admin-0.6.0-cluster/zookeeper2/zoo.cfg diff --git a/top/app/dubbo-admin-0.6.0-cluster/zookeeper3/zoo.cfg b/app/dubbo-admin-0.6.0-cluster/zookeeper3/zoo.cfg similarity index 100% rename from top/app/dubbo-admin-0.6.0-cluster/zookeeper3/zoo.cfg rename to app/dubbo-admin-0.6.0-cluster/zookeeper3/zoo.cfg diff --git a/top/app/dubbo-admin-0.6.0-standalone/demo.png b/app/dubbo-admin-0.6.0-standalone/demo.png similarity index 100% rename from top/app/dubbo-admin-0.6.0-standalone/demo.png rename to app/dubbo-admin-0.6.0-standalone/demo.png diff --git a/top/app/dubbo-admin-0.6.0-standalone/docker-compose.yml b/app/dubbo-admin-0.6.0-standalone/docker-compose.yml similarity index 100% rename from top/app/dubbo-admin-0.6.0-standalone/docker-compose.yml rename to app/dubbo-admin-0.6.0-standalone/docker-compose.yml diff --git a/top/app/dubbo-admin-0.6.0-standalone/dubbo-admin/config/application.properties b/app/dubbo-admin-0.6.0-standalone/dubbo-admin/config/application.properties similarity index 100% rename from top/app/dubbo-admin-0.6.0-standalone/dubbo-admin/config/application.properties rename to app/dubbo-admin-0.6.0-standalone/dubbo-admin/config/application.properties diff --git a/top/app/dubbo-admin-0.6.0-standalone/install.sh b/app/dubbo-admin-0.6.0-standalone/install.sh similarity index 100% rename from top/app/dubbo-admin-0.6.0-standalone/install.sh rename to app/dubbo-admin-0.6.0-standalone/install.sh diff --git a/top/app/dubbo-admin-0.6.0-standalone/run.md b/app/dubbo-admin-0.6.0-standalone/run.md similarity index 100% rename from top/app/dubbo-admin-0.6.0-standalone/run.md rename to app/dubbo-admin-0.6.0-standalone/run.md diff --git a/top/app/dubbo-admin-0.6.0-standalone/shutdown.sh b/app/dubbo-admin-0.6.0-standalone/shutdown.sh similarity index 100% rename from top/app/dubbo-admin-0.6.0-standalone/shutdown.sh rename to app/dubbo-admin-0.6.0-standalone/shutdown.sh diff --git a/top/app/dubbo-admin-0.6.0-standalone/zookeeper/zoo.cfg b/app/dubbo-admin-0.6.0-standalone/zookeeper/zoo.cfg similarity index 100% rename from top/app/dubbo-admin-0.6.0-standalone/zookeeper/zoo.cfg rename to app/dubbo-admin-0.6.0-standalone/zookeeper/zoo.cfg diff --git a/top/app/efk/demo.png b/app/efk/demo.png similarity index 100% rename from top/app/efk/demo.png rename to app/efk/demo.png diff --git a/top/app/efk/docker-compose.yml b/app/efk/docker-compose.yml similarity index 100% rename from top/app/efk/docker-compose.yml rename to app/efk/docker-compose.yml diff --git a/top/app/efk/elasticsearch/config/elasticsearch.yml b/app/efk/elasticsearch/config/elasticsearch.yml similarity index 100% rename from top/app/efk/elasticsearch/config/elasticsearch.yml rename to app/efk/elasticsearch/config/elasticsearch.yml diff --git a/top/app/efk/elasticsearch/config/jvm.options b/app/efk/elasticsearch/config/jvm.options similarity index 100% rename from top/app/efk/elasticsearch/config/jvm.options rename to app/efk/elasticsearch/config/jvm.options diff --git a/top/app/efk/filebeat/filebeat.yml b/app/efk/filebeat/filebeat.yml similarity index 100% rename from top/app/efk/filebeat/filebeat.yml rename to app/efk/filebeat/filebeat.yml diff --git a/top/app/efk/install.sh b/app/efk/install.sh similarity index 100% rename from top/app/efk/install.sh rename to app/efk/install.sh diff --git a/top/app/efk/kibana/config/kibana.yml b/app/efk/kibana/config/kibana.yml similarity index 100% rename from top/app/efk/kibana/config/kibana.yml rename to app/efk/kibana/config/kibana.yml diff --git a/top/app/efk/run.md b/app/efk/run.md similarity index 100% rename from top/app/efk/run.md rename to app/efk/run.md diff --git a/top/app/efk/shutdown.sh b/app/efk/shutdown.sh similarity index 100% rename from top/app/efk/shutdown.sh rename to app/efk/shutdown.sh diff --git a/top/app/nacos-2.5.0-cluster/demo.png b/app/nacos-2.5.0-cluster/demo.png similarity index 100% rename from top/app/nacos-2.5.0-cluster/demo.png rename to app/nacos-2.5.0-cluster/demo.png diff --git a/top/app/nacos-2.5.0-cluster/docker-compose.yml b/app/nacos-2.5.0-cluster/docker-compose.yml similarity index 100% rename from top/app/nacos-2.5.0-cluster/docker-compose.yml rename to app/nacos-2.5.0-cluster/docker-compose.yml diff --git a/top/app/nacos-2.5.0-cluster/install.sh b/app/nacos-2.5.0-cluster/install.sh similarity index 100% rename from top/app/nacos-2.5.0-cluster/install.sh rename to app/nacos-2.5.0-cluster/install.sh diff --git a/top/app/nacos-2.5.0-cluster/mysql/my.cnf b/app/nacos-2.5.0-cluster/mysql/my.cnf similarity index 100% rename from top/app/nacos-2.5.0-cluster/mysql/my.cnf rename to app/nacos-2.5.0-cluster/mysql/my.cnf diff --git a/top/app/nacos-2.5.0-cluster/nacos1/conf/application.properties b/app/nacos-2.5.0-cluster/nacos1/conf/application.properties similarity index 100% rename from top/app/nacos-2.5.0-cluster/nacos1/conf/application.properties rename to app/nacos-2.5.0-cluster/nacos1/conf/application.properties diff --git a/top/app/nacos-2.5.0-cluster/nacos2/conf/application.properties b/app/nacos-2.5.0-cluster/nacos2/conf/application.properties similarity index 100% rename from top/app/nacos-2.5.0-cluster/nacos2/conf/application.properties rename to app/nacos-2.5.0-cluster/nacos2/conf/application.properties diff --git a/top/app/nacos-2.5.0-cluster/nacos3/conf/application.properties b/app/nacos-2.5.0-cluster/nacos3/conf/application.properties similarity index 100% rename from top/app/nacos-2.5.0-cluster/nacos3/conf/application.properties rename to app/nacos-2.5.0-cluster/nacos3/conf/application.properties diff --git a/top/app/nacos-2.5.0-cluster/run.md b/app/nacos-2.5.0-cluster/run.md similarity index 100% rename from top/app/nacos-2.5.0-cluster/run.md rename to app/nacos-2.5.0-cluster/run.md diff --git a/top/app/nacos-2.5.0-cluster/scripts/mysql-schema.sql b/app/nacos-2.5.0-cluster/scripts/mysql-schema.sql similarity index 100% rename from top/app/nacos-2.5.0-cluster/scripts/mysql-schema.sql rename to app/nacos-2.5.0-cluster/scripts/mysql-schema.sql diff --git a/top/app/nacos-2.5.0-cluster/shutdown.sh b/app/nacos-2.5.0-cluster/shutdown.sh similarity index 100% rename from top/app/nacos-2.5.0-cluster/shutdown.sh rename to app/nacos-2.5.0-cluster/shutdown.sh diff --git a/top/app/nacos-2.5.0-standalone/demo.png b/app/nacos-2.5.0-standalone/demo.png similarity index 100% rename from top/app/nacos-2.5.0-standalone/demo.png rename to app/nacos-2.5.0-standalone/demo.png diff --git a/top/app/nacos-2.5.0-standalone/docker-compose.yml b/app/nacos-2.5.0-standalone/docker-compose.yml similarity index 100% rename from top/app/nacos-2.5.0-standalone/docker-compose.yml rename to app/nacos-2.5.0-standalone/docker-compose.yml diff --git a/top/app/nacos-2.5.0-standalone/install.sh b/app/nacos-2.5.0-standalone/install.sh similarity index 100% rename from top/app/nacos-2.5.0-standalone/install.sh rename to app/nacos-2.5.0-standalone/install.sh diff --git a/top/app/nacos-2.5.0-standalone/mysql/my.cnf b/app/nacos-2.5.0-standalone/mysql/my.cnf similarity index 100% rename from top/app/nacos-2.5.0-standalone/mysql/my.cnf rename to app/nacos-2.5.0-standalone/mysql/my.cnf diff --git a/top/app/nacos-2.5.0-standalone/nacos/conf/application.properties b/app/nacos-2.5.0-standalone/nacos/conf/application.properties similarity index 100% rename from top/app/nacos-2.5.0-standalone/nacos/conf/application.properties rename to app/nacos-2.5.0-standalone/nacos/conf/application.properties diff --git a/top/app/nacos-2.5.0-standalone/run.md b/app/nacos-2.5.0-standalone/run.md similarity index 100% rename from top/app/nacos-2.5.0-standalone/run.md rename to app/nacos-2.5.0-standalone/run.md diff --git a/top/app/nacos-2.5.0-standalone/scripts/mysql-schema.sql b/app/nacos-2.5.0-standalone/scripts/mysql-schema.sql similarity index 100% rename from top/app/nacos-2.5.0-standalone/scripts/mysql-schema.sql rename to app/nacos-2.5.0-standalone/scripts/mysql-schema.sql diff --git a/top/app/nacos-2.5.0-standalone/shutdown.sh b/app/nacos-2.5.0-standalone/shutdown.sh similarity index 100% rename from top/app/nacos-2.5.0-standalone/shutdown.sh rename to app/nacos-2.5.0-standalone/shutdown.sh diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/broker-master/broker.conf b/app/rocketmq-4.9.6-cluster-1m2s/broker-master/broker.conf similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/broker-master/broker.conf rename to app/rocketmq-4.9.6-cluster-1m2s/broker-master/broker.conf diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/broker-slave1/broker.conf b/app/rocketmq-4.9.6-cluster-1m2s/broker-slave1/broker.conf similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/broker-slave1/broker.conf rename to app/rocketmq-4.9.6-cluster-1m2s/broker-slave1/broker.conf diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/broker-slave2/broker.conf b/app/rocketmq-4.9.6-cluster-1m2s/broker-slave2/broker.conf similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/broker-slave2/broker.conf rename to app/rocketmq-4.9.6-cluster-1m2s/broker-slave2/broker.conf diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/demo.png b/app/rocketmq-4.9.6-cluster-1m2s/demo.png similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/demo.png rename to app/rocketmq-4.9.6-cluster-1m2s/demo.png diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/docker-compose.yml b/app/rocketmq-4.9.6-cluster-1m2s/docker-compose.yml similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/docker-compose.yml rename to app/rocketmq-4.9.6-cluster-1m2s/docker-compose.yml diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/install.sh b/app/rocketmq-4.9.6-cluster-1m2s/install.sh similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/install.sh rename to app/rocketmq-4.9.6-cluster-1m2s/install.sh diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/run.md b/app/rocketmq-4.9.6-cluster-1m2s/run.md similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/run.md rename to app/rocketmq-4.9.6-cluster-1m2s/run.md diff --git a/top/app/rocketmq-4.9.6-cluster-1m2s/shutdown.sh b/app/rocketmq-4.9.6-cluster-1m2s/shutdown.sh similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-1m2s/shutdown.sh rename to app/rocketmq-4.9.6-cluster-1m2s/shutdown.sh diff --git a/top/app/rocketmq-4.9.6-cluster-2m/broker-master1/broker.conf b/app/rocketmq-4.9.6-cluster-2m/broker-master1/broker.conf similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-2m/broker-master1/broker.conf rename to app/rocketmq-4.9.6-cluster-2m/broker-master1/broker.conf diff --git a/top/app/rocketmq-4.9.6-cluster-2m/broker-master2/broker.conf b/app/rocketmq-4.9.6-cluster-2m/broker-master2/broker.conf similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-2m/broker-master2/broker.conf rename to app/rocketmq-4.9.6-cluster-2m/broker-master2/broker.conf diff --git a/top/app/rocketmq-4.9.6-cluster-2m/demo.png b/app/rocketmq-4.9.6-cluster-2m/demo.png similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-2m/demo.png rename to app/rocketmq-4.9.6-cluster-2m/demo.png diff --git a/top/app/rocketmq-4.9.6-cluster-2m/docker-compose.yml b/app/rocketmq-4.9.6-cluster-2m/docker-compose.yml similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-2m/docker-compose.yml rename to app/rocketmq-4.9.6-cluster-2m/docker-compose.yml diff --git a/top/app/rocketmq-4.9.6-cluster-2m/install.sh b/app/rocketmq-4.9.6-cluster-2m/install.sh similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-2m/install.sh rename to app/rocketmq-4.9.6-cluster-2m/install.sh diff --git a/top/app/rocketmq-4.9.6-cluster-2m/run.md b/app/rocketmq-4.9.6-cluster-2m/run.md similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-2m/run.md rename to app/rocketmq-4.9.6-cluster-2m/run.md diff --git a/top/app/rocketmq-4.9.6-cluster-2m/shutdown.sh b/app/rocketmq-4.9.6-cluster-2m/shutdown.sh similarity index 100% rename from top/app/rocketmq-4.9.6-cluster-2m/shutdown.sh rename to app/rocketmq-4.9.6-cluster-2m/shutdown.sh diff --git a/top/app/rocketmq-4.9.6-standalone/demo.png b/app/rocketmq-4.9.6-standalone/demo.png similarity index 100% rename from top/app/rocketmq-4.9.6-standalone/demo.png rename to app/rocketmq-4.9.6-standalone/demo.png diff --git a/top/app/rocketmq-4.9.6-standalone/docker-compose.yml b/app/rocketmq-4.9.6-standalone/docker-compose.yml similarity index 100% rename from top/app/rocketmq-4.9.6-standalone/docker-compose.yml rename to app/rocketmq-4.9.6-standalone/docker-compose.yml diff --git a/top/app/rocketmq-4.9.6-standalone/install.sh b/app/rocketmq-4.9.6-standalone/install.sh similarity index 100% rename from top/app/rocketmq-4.9.6-standalone/install.sh rename to app/rocketmq-4.9.6-standalone/install.sh diff --git a/top/app/rocketmq-4.9.6-standalone/master/broker.conf b/app/rocketmq-4.9.6-standalone/master/broker.conf similarity index 100% rename from top/app/rocketmq-4.9.6-standalone/master/broker.conf rename to app/rocketmq-4.9.6-standalone/master/broker.conf diff --git a/top/app/rocketmq-4.9.6-standalone/run.md b/app/rocketmq-4.9.6-standalone/run.md similarity index 100% rename from top/app/rocketmq-4.9.6-standalone/run.md rename to app/rocketmq-4.9.6-standalone/run.md diff --git a/top/app/rocketmq-4.9.6-standalone/shutdown.sh b/app/rocketmq-4.9.6-standalone/shutdown.sh similarity index 100% rename from top/app/rocketmq-4.9.6-standalone/shutdown.sh rename to app/rocketmq-4.9.6-standalone/shutdown.sh diff --git a/app/skywalking-10.0.1-agent/README.md b/app/skywalking-10.0.1-agent/README.md new file mode 100644 index 0000000..17fef67 --- /dev/null +++ b/app/skywalking-10.0.1-agent/README.md @@ -0,0 +1,14 @@ +# SkyWalking Java Agent 9.3.0 + +SkyWalking 10.0.1 对应的 Java Agent 接入包,无 Docker 编排,直接取本目录的 `apache-skywalking-java-agent-9.3.0.tgz` 注入应用: + +```shell +tar -xzf apache-skywalking-java-agent-9.3.0.tgz +java -javaagent:/path/to/skywalking-agent/skywalking-agent.jar \ + -Dskywalking.agent.service_name=<应用名> \ + -Dskywalking.collector.backend_service=:11800 \ + -jar app.jar +``` + +- Agent 包版本与 OAP 版本是两套编号,Agent 9.3.0 对应 OAP 10.0.1 +- OAP 部署见 `app/skywalking-10.0.1-es` 或 `app/skywalking-10.0.1-mysql` diff --git a/top/app/skywalking-10.0.1-es/docker-compose.yml b/app/skywalking-10.0.1-es/docker-compose.yml similarity index 100% rename from top/app/skywalking-10.0.1-es/docker-compose.yml rename to app/skywalking-10.0.1-es/docker-compose.yml diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/config/elasticsearch.yml b/app/skywalking-10.0.1-es/elasticsearch/config/elasticsearch.yml similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/config/elasticsearch.yml rename to app/skywalking-10.0.1-es/elasticsearch/config/elasticsearch.yml diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/config/jvm.options b/app/skywalking-10.0.1-es/elasticsearch/config/jvm.options similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/config/jvm.options rename to app/skywalking-10.0.1-es/elasticsearch/config/jvm.options diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/kibana/config/kibana.yml b/app/skywalking-10.0.1-es/elasticsearch/kibana/config/kibana.yml similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/kibana/config/kibana.yml rename to app/skywalking-10.0.1-es/elasticsearch/kibana/config/kibana.yml diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-codec-1.9.jar b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-codec-1.9.jar similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-codec-1.9.jar rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-codec-1.9.jar diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-logging-1.2.jar b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-logging-1.2.jar similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-logging-1.2.jar rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/commons-logging-1.2.jar diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_main.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_main.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_main.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_main.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_stopword.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_stopword.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_stopword.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/extra_stopword.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/main.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/main.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/main.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/main.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/preposition.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/preposition.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/preposition.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/preposition.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/quantifier.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/quantifier.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/quantifier.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/quantifier.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/stopword.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/stopword.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/stopword.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/stopword.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/suffix.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/suffix.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/suffix.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/suffix.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/surname.dic b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/surname.dic similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/surname.dic rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/config/surname.dic diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-descriptor.properties b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-descriptor.properties similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-descriptor.properties rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-descriptor.properties diff --git a/top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-security.policy b/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-security.policy similarity index 100% rename from top/app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-security.policy rename to app/skywalking-10.0.1-es/elasticsearch/plugins/ik/plugin-security.policy diff --git a/top/app/skywalking-10.0.1-es/idea-jvm-options.png b/app/skywalking-10.0.1-es/idea-jvm-options.png similarity index 100% rename from top/app/skywalking-10.0.1-es/idea-jvm-options.png rename to app/skywalking-10.0.1-es/idea-jvm-options.png diff --git a/top/app/skywalking-10.0.1-es/install.sh b/app/skywalking-10.0.1-es/install.sh similarity index 100% rename from top/app/skywalking-10.0.1-es/install.sh rename to app/skywalking-10.0.1-es/install.sh diff --git a/top/app/skywalking-10.0.1-es/run.md b/app/skywalking-10.0.1-es/run.md similarity index 100% rename from top/app/skywalking-10.0.1-es/run.md rename to app/skywalking-10.0.1-es/run.md diff --git a/top/app/skywalking-10.0.1-es/shutdown.sh b/app/skywalking-10.0.1-es/shutdown.sh similarity index 100% rename from top/app/skywalking-10.0.1-es/shutdown.sh rename to app/skywalking-10.0.1-es/shutdown.sh diff --git a/top/app/skywalking-10.0.1-mysql/docker-compose.yml b/app/skywalking-10.0.1-mysql/docker-compose.yml similarity index 100% rename from top/app/skywalking-10.0.1-mysql/docker-compose.yml rename to app/skywalking-10.0.1-mysql/docker-compose.yml diff --git a/top/app/skywalking-10.0.1-mysql/idea-jvm-options.png b/app/skywalking-10.0.1-mysql/idea-jvm-options.png similarity index 100% rename from top/app/skywalking-10.0.1-mysql/idea-jvm-options.png rename to app/skywalking-10.0.1-mysql/idea-jvm-options.png diff --git a/top/app/skywalking-10.0.1-mysql/install.sh b/app/skywalking-10.0.1-mysql/install.sh similarity index 100% rename from top/app/skywalking-10.0.1-mysql/install.sh rename to app/skywalking-10.0.1-mysql/install.sh diff --git a/top/app/skywalking-10.0.1-mysql/mysql/my.cnf b/app/skywalking-10.0.1-mysql/mysql/my.cnf similarity index 100% rename from top/app/skywalking-10.0.1-mysql/mysql/my.cnf rename to app/skywalking-10.0.1-mysql/mysql/my.cnf diff --git a/top/app/skywalking-10.0.1-mysql/run.md b/app/skywalking-10.0.1-mysql/run.md similarity index 100% rename from top/app/skywalking-10.0.1-mysql/run.md rename to app/skywalking-10.0.1-mysql/run.md diff --git a/top/app/skywalking-10.0.1-mysql/shutdown.sh b/app/skywalking-10.0.1-mysql/shutdown.sh similarity index 100% rename from top/app/skywalking-10.0.1-mysql/shutdown.sh rename to app/skywalking-10.0.1-mysql/shutdown.sh diff --git a/top/app/skywalking-10.0.1-mysql/skywalking/mysql-connector-java-8.0.28.jar b/app/skywalking-10.0.1-mysql/skywalking/mysql-connector-java-8.0.28.jar similarity index 100% rename from top/app/skywalking-10.0.1-mysql/skywalking/mysql-connector-java-8.0.28.jar rename to app/skywalking-10.0.1-mysql/skywalking/mysql-connector-java-8.0.28.jar diff --git a/app/skywalking-9.5.0-agent/README.md b/app/skywalking-9.5.0-agent/README.md new file mode 100644 index 0000000..4f2c046 --- /dev/null +++ b/app/skywalking-9.5.0-agent/README.md @@ -0,0 +1,14 @@ +# SkyWalking Java Agent 8.15.0 + +SkyWalking 9.5.0 对应的 Java Agent 接入包,无 Docker 编排,直接取本目录的 `apache-skywalking-java-agent-8.15.0.tgz` 注入应用: + +```shell +tar -xzf apache-skywalking-java-agent-8.15.0.tgz +java -javaagent:/path/to/skywalking-agent/skywalking-agent.jar \ + -Dskywalking.agent.service_name=<应用名> \ + -Dskywalking.collector.backend_service=:11800 \ + -jar app.jar +``` + +- Agent 包版本与 OAP 版本是两套编号,Agent 8.x 对应 OAP 9.5.0 +- OAP 部署见 `app/skywalking-9.5.0-es` 或 `app/skywalking-9.5.0-mysql` diff --git a/top/app/skywalking-9.5.0-es/docker-compose.yml b/app/skywalking-9.5.0-es/docker-compose.yml similarity index 100% rename from top/app/skywalking-9.5.0-es/docker-compose.yml rename to app/skywalking-9.5.0-es/docker-compose.yml diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/config/elasticsearch.yml b/app/skywalking-9.5.0-es/elasticsearch/config/elasticsearch.yml similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/config/elasticsearch.yml rename to app/skywalking-9.5.0-es/elasticsearch/config/elasticsearch.yml diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/config/jvm.options b/app/skywalking-9.5.0-es/elasticsearch/config/jvm.options similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/config/jvm.options rename to app/skywalking-9.5.0-es/elasticsearch/config/jvm.options diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/kibana/config/kibana.yml b/app/skywalking-9.5.0-es/elasticsearch/kibana/config/kibana.yml similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/kibana/config/kibana.yml rename to app/skywalking-9.5.0-es/elasticsearch/kibana/config/kibana.yml diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_main.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_main.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_main.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_main.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/main.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/main.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/main.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/main.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/preposition.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/preposition.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/preposition.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/preposition.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/quantifier.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/quantifier.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/quantifier.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/quantifier.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/stopword.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/stopword.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/stopword.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/stopword.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/suffix.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/suffix.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/suffix.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/suffix.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/surname.dic b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/surname.dic similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/surname.dic rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/config/surname.dic diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties diff --git a/top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-security.policy b/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-security.policy similarity index 100% rename from top/app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-security.policy rename to app/skywalking-9.5.0-es/elasticsearch/plugins/ik/plugin-security.policy diff --git a/top/app/skywalking-9.5.0-es/idea-jvm-options.png b/app/skywalking-9.5.0-es/idea-jvm-options.png similarity index 100% rename from top/app/skywalking-9.5.0-es/idea-jvm-options.png rename to app/skywalking-9.5.0-es/idea-jvm-options.png diff --git a/top/app/skywalking-9.5.0-es/install.sh b/app/skywalking-9.5.0-es/install.sh similarity index 100% rename from top/app/skywalking-9.5.0-es/install.sh rename to app/skywalking-9.5.0-es/install.sh diff --git a/top/app/skywalking-9.5.0-es/run.md b/app/skywalking-9.5.0-es/run.md similarity index 100% rename from top/app/skywalking-9.5.0-es/run.md rename to app/skywalking-9.5.0-es/run.md diff --git a/top/app/skywalking-9.5.0-es/shutdown.sh b/app/skywalking-9.5.0-es/shutdown.sh similarity index 100% rename from top/app/skywalking-9.5.0-es/shutdown.sh rename to app/skywalking-9.5.0-es/shutdown.sh diff --git a/top/app/skywalking-9.5.0-mysql/docker-compose.yml b/app/skywalking-9.5.0-mysql/docker-compose.yml similarity index 100% rename from top/app/skywalking-9.5.0-mysql/docker-compose.yml rename to app/skywalking-9.5.0-mysql/docker-compose.yml diff --git a/top/app/skywalking-9.5.0-mysql/idea-jvm-options.png b/app/skywalking-9.5.0-mysql/idea-jvm-options.png similarity index 100% rename from top/app/skywalking-9.5.0-mysql/idea-jvm-options.png rename to app/skywalking-9.5.0-mysql/idea-jvm-options.png diff --git a/top/app/skywalking-9.5.0-mysql/install.sh b/app/skywalking-9.5.0-mysql/install.sh similarity index 100% rename from top/app/skywalking-9.5.0-mysql/install.sh rename to app/skywalking-9.5.0-mysql/install.sh diff --git a/top/app/skywalking-9.5.0-mysql/mysql/my.cnf b/app/skywalking-9.5.0-mysql/mysql/my.cnf similarity index 100% rename from top/app/skywalking-9.5.0-mysql/mysql/my.cnf rename to app/skywalking-9.5.0-mysql/mysql/my.cnf diff --git a/top/app/skywalking-9.5.0-mysql/run.md b/app/skywalking-9.5.0-mysql/run.md similarity index 100% rename from top/app/skywalking-9.5.0-mysql/run.md rename to app/skywalking-9.5.0-mysql/run.md diff --git a/top/app/skywalking-9.5.0-mysql/shutdown.sh b/app/skywalking-9.5.0-mysql/shutdown.sh similarity index 100% rename from top/app/skywalking-9.5.0-mysql/shutdown.sh rename to app/skywalking-9.5.0-mysql/shutdown.sh diff --git a/top/app/skywalking-9.5.0-mysql/skywalking/mysql-connector-j-9.2.0.jar b/app/skywalking-9.5.0-mysql/skywalking/mysql-connector-j-9.2.0.jar similarity index 100% rename from top/app/skywalking-9.5.0-mysql/skywalking/mysql-connector-j-9.2.0.jar rename to app/skywalking-9.5.0-mysql/skywalking/mysql-connector-j-9.2.0.jar diff --git a/app/skywalking-9.7.0-agent/README.md b/app/skywalking-9.7.0-agent/README.md new file mode 100644 index 0000000..afc9256 --- /dev/null +++ b/app/skywalking-9.7.0-agent/README.md @@ -0,0 +1,14 @@ +# SkyWalking Java Agent 9.1.0 + +SkyWalking 9.7.0 对应的 Java Agent 接入包,无 Docker 编排,直接取本目录的 `apache-skywalking-java-agent-9.1.0.tgz` 注入应用: + +```shell +tar -xzf apache-skywalking-java-agent-9.1.0.tgz +java -javaagent:/path/to/skywalking-agent/skywalking-agent.jar \ + -Dskywalking.agent.service_name=<应用名> \ + -Dskywalking.collector.backend_service=:11800 \ + -jar app.jar +``` + +- Agent 包版本与 OAP 版本是两套编号,Agent 9.1.0 对应 OAP 9.7.0 +- OAP 部署见 `app/skywalking-9.7.0-es` 或 `app/skywalking-9.7.0-mysql` diff --git a/top/app/skywalking-9.7.0-es/docker-compose.yml b/app/skywalking-9.7.0-es/docker-compose.yml similarity index 100% rename from top/app/skywalking-9.7.0-es/docker-compose.yml rename to app/skywalking-9.7.0-es/docker-compose.yml diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/config/elasticsearch.yml b/app/skywalking-9.7.0-es/elasticsearch/config/elasticsearch.yml similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/config/elasticsearch.yml rename to app/skywalking-9.7.0-es/elasticsearch/config/elasticsearch.yml diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/config/jvm.options b/app/skywalking-9.7.0-es/elasticsearch/config/jvm.options similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/config/jvm.options rename to app/skywalking-9.7.0-es/elasticsearch/config/jvm.options diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/kibana/config/kibana.yml b/app/skywalking-9.7.0-es/elasticsearch/kibana/config/kibana.yml similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/kibana/config/kibana.yml rename to app/skywalking-9.7.0-es/elasticsearch/kibana/config/kibana.yml diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-codec-1.9.jar diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/commons-logging-1.2.jar diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/IKAnalyzer.cfg.xml diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_main.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_main.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_main.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_main.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_full.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_single_word_low_freq.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/extra_stopword.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/main.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/main.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/main.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/main.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/preposition.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/preposition.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/preposition.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/preposition.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/quantifier.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/quantifier.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/quantifier.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/quantifier.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/stopword.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/stopword.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/stopword.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/stopword.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/suffix.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/suffix.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/suffix.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/suffix.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/surname.dic b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/surname.dic similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/surname.dic rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/config/surname.dic diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/elasticsearch-analysis-ik-7.14.1.jar diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpclient-4.5.2.jar diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/httpcore-4.4.4.jar diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-descriptor.properties diff --git a/top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-security.policy b/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-security.policy similarity index 100% rename from top/app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-security.policy rename to app/skywalking-9.7.0-es/elasticsearch/plugins/ik/plugin-security.policy diff --git a/top/app/skywalking-9.7.0-es/idea-jvm-options.png b/app/skywalking-9.7.0-es/idea-jvm-options.png similarity index 100% rename from top/app/skywalking-9.7.0-es/idea-jvm-options.png rename to app/skywalking-9.7.0-es/idea-jvm-options.png diff --git a/top/app/skywalking-9.7.0-es/install.sh b/app/skywalking-9.7.0-es/install.sh similarity index 100% rename from top/app/skywalking-9.7.0-es/install.sh rename to app/skywalking-9.7.0-es/install.sh diff --git a/top/app/skywalking-9.7.0-es/run.md b/app/skywalking-9.7.0-es/run.md similarity index 100% rename from top/app/skywalking-9.7.0-es/run.md rename to app/skywalking-9.7.0-es/run.md diff --git a/top/app/skywalking-9.7.0-es/shutdown.sh b/app/skywalking-9.7.0-es/shutdown.sh similarity index 100% rename from top/app/skywalking-9.7.0-es/shutdown.sh rename to app/skywalking-9.7.0-es/shutdown.sh diff --git a/top/app/skywalking-9.7.0-mysql/docker-compose.yml b/app/skywalking-9.7.0-mysql/docker-compose.yml similarity index 100% rename from top/app/skywalking-9.7.0-mysql/docker-compose.yml rename to app/skywalking-9.7.0-mysql/docker-compose.yml diff --git a/top/app/skywalking-9.7.0-mysql/idea-jvm-options.png b/app/skywalking-9.7.0-mysql/idea-jvm-options.png similarity index 100% rename from top/app/skywalking-9.7.0-mysql/idea-jvm-options.png rename to app/skywalking-9.7.0-mysql/idea-jvm-options.png diff --git a/top/app/skywalking-9.7.0-mysql/install.sh b/app/skywalking-9.7.0-mysql/install.sh similarity index 100% rename from top/app/skywalking-9.7.0-mysql/install.sh rename to app/skywalking-9.7.0-mysql/install.sh diff --git a/top/app/skywalking-9.7.0-mysql/mysql/my.cnf b/app/skywalking-9.7.0-mysql/mysql/my.cnf similarity index 100% rename from top/app/skywalking-9.7.0-mysql/mysql/my.cnf rename to app/skywalking-9.7.0-mysql/mysql/my.cnf diff --git a/top/app/skywalking-9.7.0-mysql/run.md b/app/skywalking-9.7.0-mysql/run.md similarity index 100% rename from top/app/skywalking-9.7.0-mysql/run.md rename to app/skywalking-9.7.0-mysql/run.md diff --git a/top/app/skywalking-9.7.0-mysql/shutdown.sh b/app/skywalking-9.7.0-mysql/shutdown.sh similarity index 100% rename from top/app/skywalking-9.7.0-mysql/shutdown.sh rename to app/skywalking-9.7.0-mysql/shutdown.sh diff --git a/top/app/skywalking-9.7.0-mysql/skywalking/mysql-connector-j-9.2.0.jar b/app/skywalking-9.7.0-mysql/skywalking/mysql-connector-j-9.2.0.jar similarity index 100% rename from top/app/skywalking-9.7.0-mysql/skywalking/mysql-connector-j-9.2.0.jar rename to app/skywalking-9.7.0-mysql/skywalking/mysql-connector-j-9.2.0.jar diff --git a/top/app/tengine-3.1.0/.gitignore b/app/tengine-3.1.0/.gitignore similarity index 100% rename from top/app/tengine-3.1.0/.gitignore rename to app/tengine-3.1.0/.gitignore diff --git a/top/app/tengine-3.1.0/docker-compose.yml b/app/tengine-3.1.0/docker-compose.yml similarity index 100% rename from top/app/tengine-3.1.0/docker-compose.yml rename to app/tengine-3.1.0/docker-compose.yml diff --git a/top/app/tengine-3.1.0/install.sh b/app/tengine-3.1.0/install.sh similarity index 100% rename from top/app/tengine-3.1.0/install.sh rename to app/tengine-3.1.0/install.sh diff --git a/top/app/tengine-3.1.0/nginx/conf.d/demo.odboy.cn.conf b/app/tengine-3.1.0/nginx/conf.d/demo.odboy.cn.conf similarity index 100% rename from top/app/tengine-3.1.0/nginx/conf.d/demo.odboy.cn.conf rename to app/tengine-3.1.0/nginx/conf.d/demo.odboy.cn.conf diff --git a/top/app/tengine-3.1.0/nginx/html/index.html b/app/tengine-3.1.0/nginx/html/index.html similarity index 100% rename from top/app/tengine-3.1.0/nginx/html/index.html rename to app/tengine-3.1.0/nginx/html/index.html diff --git a/top/app/tengine-3.1.0/nginx/logs/.gitignore b/app/tengine-3.1.0/nginx/logs/.gitignore similarity index 100% rename from top/app/tengine-3.1.0/nginx/logs/.gitignore rename to app/tengine-3.1.0/nginx/logs/.gitignore diff --git a/top/app/tengine-3.1.0/nginx/ssl/.gitignore b/app/tengine-3.1.0/nginx/ssl/.gitignore similarity index 100% rename from top/app/tengine-3.1.0/nginx/ssl/.gitignore rename to app/tengine-3.1.0/nginx/ssl/.gitignore diff --git a/top/app/tengine-3.1.0/run.md b/app/tengine-3.1.0/run.md similarity index 100% rename from top/app/tengine-3.1.0/run.md rename to app/tengine-3.1.0/run.md diff --git a/top/app/tengine-3.1.0/shutdown.sh b/app/tengine-3.1.0/shutdown.sh similarity index 100% rename from top/app/tengine-3.1.0/shutdown.sh rename to app/tengine-3.1.0/shutdown.sh diff --git a/top/app/zookeeper-3.8.4-cluster/demo.png b/app/zookeeper-3.8.4-cluster/demo.png similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/demo.png rename to app/zookeeper-3.8.4-cluster/demo.png diff --git a/top/app/zookeeper-3.8.4-cluster/docker-compose.yml b/app/zookeeper-3.8.4-cluster/docker-compose.yml similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/docker-compose.yml rename to app/zookeeper-3.8.4-cluster/docker-compose.yml diff --git a/top/app/zookeeper-3.8.4-cluster/install.sh b/app/zookeeper-3.8.4-cluster/install.sh similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/install.sh rename to app/zookeeper-3.8.4-cluster/install.sh diff --git a/top/app/zookeeper-3.8.4-cluster/run.md b/app/zookeeper-3.8.4-cluster/run.md similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/run.md rename to app/zookeeper-3.8.4-cluster/run.md diff --git a/top/app/zookeeper-3.8.4-cluster/shutdown.sh b/app/zookeeper-3.8.4-cluster/shutdown.sh similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/shutdown.sh rename to app/zookeeper-3.8.4-cluster/shutdown.sh diff --git a/top/app/zookeeper-3.8.4-cluster/zookeeper1/zoo.cfg b/app/zookeeper-3.8.4-cluster/zookeeper1/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/zookeeper1/zoo.cfg rename to app/zookeeper-3.8.4-cluster/zookeeper1/zoo.cfg diff --git a/top/app/zookeeper-3.8.4-cluster/zookeeper2/zoo.cfg b/app/zookeeper-3.8.4-cluster/zookeeper2/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/zookeeper2/zoo.cfg rename to app/zookeeper-3.8.4-cluster/zookeeper2/zoo.cfg diff --git a/top/app/zookeeper-3.8.4-cluster/zookeeper3/zoo.cfg b/app/zookeeper-3.8.4-cluster/zookeeper3/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.8.4-cluster/zookeeper3/zoo.cfg rename to app/zookeeper-3.8.4-cluster/zookeeper3/zoo.cfg diff --git a/top/app/zookeeper-3.8.4-standalone/docker-compose.yml b/app/zookeeper-3.8.4-standalone/docker-compose.yml similarity index 100% rename from top/app/zookeeper-3.8.4-standalone/docker-compose.yml rename to app/zookeeper-3.8.4-standalone/docker-compose.yml diff --git a/top/app/zookeeper-3.8.4-standalone/install.sh b/app/zookeeper-3.8.4-standalone/install.sh similarity index 100% rename from top/app/zookeeper-3.8.4-standalone/install.sh rename to app/zookeeper-3.8.4-standalone/install.sh diff --git a/top/app/zookeeper-3.8.4-standalone/run.md b/app/zookeeper-3.8.4-standalone/run.md similarity index 100% rename from top/app/zookeeper-3.8.4-standalone/run.md rename to app/zookeeper-3.8.4-standalone/run.md diff --git a/top/app/zookeeper-3.8.4-standalone/shutdown.sh b/app/zookeeper-3.8.4-standalone/shutdown.sh similarity index 100% rename from top/app/zookeeper-3.8.4-standalone/shutdown.sh rename to app/zookeeper-3.8.4-standalone/shutdown.sh diff --git a/top/app/zookeeper-3.8.4-standalone/zookeeper/zoo.cfg b/app/zookeeper-3.8.4-standalone/zookeeper/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.8.4-standalone/zookeeper/zoo.cfg rename to app/zookeeper-3.8.4-standalone/zookeeper/zoo.cfg diff --git a/top/app/zookeeper-3.9.3-cluster/demo.png b/app/zookeeper-3.9.3-cluster/demo.png similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/demo.png rename to app/zookeeper-3.9.3-cluster/demo.png diff --git a/top/app/zookeeper-3.9.3-cluster/docker-compose.yml b/app/zookeeper-3.9.3-cluster/docker-compose.yml similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/docker-compose.yml rename to app/zookeeper-3.9.3-cluster/docker-compose.yml diff --git a/top/app/zookeeper-3.9.3-cluster/install.sh b/app/zookeeper-3.9.3-cluster/install.sh similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/install.sh rename to app/zookeeper-3.9.3-cluster/install.sh diff --git a/top/app/zookeeper-3.9.3-cluster/run.md b/app/zookeeper-3.9.3-cluster/run.md similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/run.md rename to app/zookeeper-3.9.3-cluster/run.md diff --git a/top/app/zookeeper-3.9.3-cluster/shutdown.sh b/app/zookeeper-3.9.3-cluster/shutdown.sh similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/shutdown.sh rename to app/zookeeper-3.9.3-cluster/shutdown.sh diff --git a/top/app/zookeeper-3.9.3-cluster/zookeeper1/zoo.cfg b/app/zookeeper-3.9.3-cluster/zookeeper1/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/zookeeper1/zoo.cfg rename to app/zookeeper-3.9.3-cluster/zookeeper1/zoo.cfg diff --git a/top/app/zookeeper-3.9.3-cluster/zookeeper2/zoo.cfg b/app/zookeeper-3.9.3-cluster/zookeeper2/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/zookeeper2/zoo.cfg rename to app/zookeeper-3.9.3-cluster/zookeeper2/zoo.cfg diff --git a/top/app/zookeeper-3.9.3-cluster/zookeeper3/zoo.cfg b/app/zookeeper-3.9.3-cluster/zookeeper3/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.9.3-cluster/zookeeper3/zoo.cfg rename to app/zookeeper-3.9.3-cluster/zookeeper3/zoo.cfg diff --git a/top/app/zookeeper-3.9.3-standalone/docker-compose.yml b/app/zookeeper-3.9.3-standalone/docker-compose.yml similarity index 100% rename from top/app/zookeeper-3.9.3-standalone/docker-compose.yml rename to app/zookeeper-3.9.3-standalone/docker-compose.yml diff --git a/top/app/zookeeper-3.9.3-standalone/install.sh b/app/zookeeper-3.9.3-standalone/install.sh similarity index 100% rename from top/app/zookeeper-3.9.3-standalone/install.sh rename to app/zookeeper-3.9.3-standalone/install.sh diff --git a/top/app/zookeeper-3.9.3-standalone/run.md b/app/zookeeper-3.9.3-standalone/run.md similarity index 100% rename from top/app/zookeeper-3.9.3-standalone/run.md rename to app/zookeeper-3.9.3-standalone/run.md diff --git a/top/app/zookeeper-3.9.3-standalone/shutdown.sh b/app/zookeeper-3.9.3-standalone/shutdown.sh similarity index 100% rename from top/app/zookeeper-3.9.3-standalone/shutdown.sh rename to app/zookeeper-3.9.3-standalone/shutdown.sh diff --git a/top/app/zookeeper-3.9.3-standalone/zookeeper/zoo.cfg b/app/zookeeper-3.9.3-standalone/zookeeper/zoo.cfg similarity index 100% rename from top/app/zookeeper-3.9.3-standalone/zookeeper/zoo.cfg rename to app/zookeeper-3.9.3-standalone/zookeeper/zoo.cfg diff --git a/docs/index.md b/docs/index.md index 8ec2518..881afa2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -3,54 +3,54 @@ - [README](../README.md):结构说明、镜像与部署编排总表 - 镜像仓库:`registry.cn-shanghai.aliyuncs.com/odboy/` -## 自建镜像 `top/image` +## 自建镜像 `image` 目录名即镜像 tag,镜像全名 `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:<目录名>`。 -构建:`cd top/image/<目录> && sh build.sh`。 +构建:`cd image/<目录> && sh build.sh`。 -| 目录 | 说明 | -|------------------------------------------------------------------------|----------------------------------------------| -| [alinux3-update20261111](../top/image/alinux3-update20261111) | 系统基础镜像(alinux3 3.13.3),其余镜像均基于它 | -| [runtime-jdk11](../top/image/runtime-jdk11) | JDK 11 运行环境 | -| [runtime-jdk17](../top/image/runtime-jdk17) | JDK 17 运行环境 | -| [runtime-jdk21](../top/image/runtime-jdk21) | JDK 21.0.2 运行环境 | -| [runtime-python3](../top/image/runtime-python3) | Python 3.10.0 运行环境(含 `pip.conf` 镜像源) | -| [runtime-dotnet6](../top/image/runtime-dotnet6) | ASP.NET Core 运行时 6.0.35 | -| [runtime-dotnet8](../top/image/runtime-dotnet8) | ASP.NET Core 运行时 8.0.x | -| [runtime-dotnet9](../top/image/runtime-dotnet9) | ASP.NET Core 运行时 9.0.x | -| [compile-dotnet6](../top/image/compile-dotnet6) | .NET SDK 6.0.427 编译环境,两阶段构建示例见 [demo](../top/image/compile-dotnet6/demo/run.md) | -| [compile-dotnet8](../top/image/compile-dotnet8) | .NET SDK 8.0.403 编译环境 | -| [compile-dotnet9](../top/image/compile-dotnet9) | .NET SDK 9.0.100-rc.2 编译环境 | -| [proxy-tengine3](../top/image/proxy-tengine3) | Tengine 3.1.0 源码编译(反代 / Web 服务器) | -| [tools-ansible](../top/image/tools-ansible) | Python 3.10.0 + Ansible 运维工具镜像 | +| 目录 | Dockerfile | 说明 | +| --------------------------------------------------------- | --------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- | +| [alinux3-update20261111](../image/alinux3-update20261111) | [`alinux3-update20261111/Dockerfile`](../image/alinux3-update20261111/Dockerfile) | 系统基础镜像(alinux3 3.13.3),其余镜像均基于它 | +| [runtime-jdk11](../image/runtime-jdk11) | [`runtime-jdk11/Dockerfile`](../image/runtime-jdk11/Dockerfile) | JDK 11 运行环境 | +| [runtime-jdk17](../image/runtime-jdk17) | [`runtime-jdk17/Dockerfile`](../image/runtime-jdk17/Dockerfile) | JDK 17 运行环境 | +| [runtime-jdk21](../image/runtime-jdk21) | [`runtime-jdk21/Dockerfile`](../image/runtime-jdk21/Dockerfile) | JDK 21.0.2 运行环境 | +| [runtime-python3](../image/runtime-python3) | [`runtime-python3/Dockerfile`](../image/runtime-python3/Dockerfile) | Python 3.10.0 运行环境(含 `pip.conf` 镜像源) | +| [runtime-dotnet6](../image/runtime-dotnet6) | [`runtime-dotnet6/Dockerfile`](../image/runtime-dotnet6/Dockerfile) | ASP.NET Core 运行时 6.0.35 | +| [runtime-dotnet8](../image/runtime-dotnet8) | [`runtime-dotnet8/Dockerfile`](../image/runtime-dotnet8/Dockerfile) | ASP.NET Core 运行时 8.0.x | +| [runtime-dotnet9](../image/runtime-dotnet9) | [`runtime-dotnet9/Dockerfile`](../image/runtime-dotnet9/Dockerfile) | ASP.NET Core 运行时 9.0.x | +| [compile-dotnet6](../image/compile-dotnet6) | [`compile-dotnet6/Dockerfile`](../image/compile-dotnet6/Dockerfile) | .NET SDK 6.0.427 编译环境,两阶段构建示例见 [demo](../image/compile-dotnet6/demo/run.md) | +| [compile-dotnet8](../image/compile-dotnet8) | [`compile-dotnet8/Dockerfile`](../image/compile-dotnet8/Dockerfile) | .NET SDK 8.0.403 编译环境 | +| [compile-dotnet9](../image/compile-dotnet9) | [`compile-dotnet9/Dockerfile`](../image/compile-dotnet9/Dockerfile) | .NET SDK 9.0.100-rc.2 编译环境 | +| [proxy-tengine3](../image/proxy-tengine3) | [`proxy-tengine3/Dockerfile`](../image/proxy-tengine3/Dockerfile) | Tengine 3.1.0 源码编译(反代 / Web 服务器) | +| [tools-ansible](../image/tools-ansible) | [`tools-ansible/Dockerfile`](../image/tools-ansible/Dockerfile) | Python 3.10.0 + Ansible 运维工具镜像 | -## 部署编排 `top/app` +## 部署编排 `app` -部署:`cd top/app/<目录>` 后 `sh install.sh`(启动)/ `sh shutdown.sh`(停止)。 +部署:`cd app/<目录>` 后 `sh install.sh`(启动)/ `sh shutdown.sh`(停止)。 -| 组件 | 版本 / 形态 | 目录(`run.md` 为部署说明) | -|------------|-----------------------------|---------------------------------------------------------------------------------------------------------| -| Nacos | 2.5.0 单机(MySQL 存储) | [nacos-2.5.0-standalone](../top/app/nacos-2.5.0-standalone/run.md) | -| Nacos | 2.5.0 三节点集群(MySQL 存储) | [nacos-2.5.0-cluster](../top/app/nacos-2.5.0-cluster/run.md) | -| Dubbo Admin | 0.6.0 单机(Zookeeper 3.9.3) | [dubbo-admin-0.6.0-standalone](../top/app/dubbo-admin-0.6.0-standalone/run.md) | -| Dubbo Admin | 0.6.0 + Zookeeper 3.9.3 集群 | [dubbo-admin-0.6.0-cluster](../top/app/dubbo-admin-0.6.0-cluster/run.md) | -| Zookeeper | 3.8.4 单机 | [zookeeper-3.8.4-standalone](../top/app/zookeeper-3.8.4-standalone/run.md) | -| Zookeeper | 3.8.4 三节点集群 | [zookeeper-3.8.4-cluster](../top/app/zookeeper-3.8.4-cluster/run.md) | -| Zookeeper | 3.9.3 单机 | [zookeeper-3.9.3-standalone](../top/app/zookeeper-3.9.3-standalone/run.md) | -| Zookeeper | 3.9.3 三节点集群 | [zookeeper-3.9.3-cluster](../top/app/zookeeper-3.9.3-cluster/run.md) | -| RocketMQ | 4.9.6 单机 | [rocketmq-4.9.6-standalone](../top/app/rocketmq-4.9.6-standalone/run.md) | -| RocketMQ | 4.9.6 单集群 1 主 2 从 | [rocketmq-4.9.6-cluster-1m2s](../top/app/rocketmq-4.9.6-cluster-1m2s/run.md) | -| RocketMQ | 4.9.6 双主 | [rocketmq-4.9.6-cluster-2m](../top/app/rocketmq-4.9.6-cluster-2m/run.md) | -| EFK | ES / Kibana / Filebeat 7.14.1 | [efk](../top/app/efk/run.md) | -| SkyWalking | 9.5.0 + ES 7.14.1 | [skywalking-9.5.0-es](../top/app/skywalking-9.5.0-es/run.md) | -| SkyWalking | 9.5.0 + MySQL 8.0 | [skywalking-9.5.0-mysql](../top/app/skywalking-9.5.0-mysql/run.md) | -| SkyWalking | 9.5.0 接入端(Java Agent 8.15.0) | [skywalking-9.5.0-agent](../top/app/skywalking-9.5.0-agent) | -| SkyWalking | 9.7.0 + ES 7.14.1 | [skywalking-9.7.0-es](../top/app/skywalking-9.7.0-es/run.md) | -| SkyWalking | 9.7.0 + MySQL 8.0 | [skywalking-9.7.0-mysql](../top/app/skywalking-9.7.0-mysql/run.md) | -| SkyWalking | 9.7.0 接入端(Java Agent 9.1.0) | [skywalking-9.7.0-agent](../top/app/skywalking-9.7.0-agent) | -| SkyWalking | 10.0.1 + ES 7.14.1 | [skywalking-10.0.1-es](../top/app/skywalking-10.0.1-es/run.md) | -| SkyWalking | 10.0.1 + MySQL 8.0 | [skywalking-10.0.1-mysql](../top/app/skywalking-10.0.1-mysql/run.md) | -| SkyWalking | 10.0.1 接入端(Java Agent 9.3.0) | [skywalking-10.0.1-agent](../top/app/skywalking-10.0.1-agent) | -| Tengine | 3.1.0 反代示例 | [tengine-3.1.0](../top/app/tengine-3.1.0/run.md) | +| 组件 | 版本 / 形态 | 目录 | 文档 | +| ----------- | --------------------------------- | ---------------------------------------------------------------------------- | ------------------------------------------- | +| Nacos | 2.5.0 单机(MySQL 存储) | [`nacos-2.5.0-standalone`](../app/nacos-2.5.0-standalone/run.md) | [说明](../app/nacos-2.5.0-standalone) | +| Nacos | 2.5.0 三节点集群(MySQL 存储) | [`nacos-2.5.0-cluster`](../app/nacos-2.5.0-cluster/run.md) | [说明](../app/nacos-2.5.0-cluster) | +| Dubbo Admin | 0.6.0 单机(Zookeeper 3.9.3) | [`dubbo-admin-0.6.0-standalone`](../app/dubbo-admin-0.6.0-standalone/run.md) | [说明](../app/dubbo-admin-0.6.0-standalone) | +| Dubbo Admin | 0.6.0 + Zookeeper 3.9.3 集群 | [`dubbo-admin-0.6.0-cluster`](../app/dubbo-admin-0.6.0-cluster/run.md) | [说明](../app/dubbo-admin-0.6.0-cluster) | +| Zookeeper | 3.8.4 单机 | [`zookeeper-3.8.4-standalone`](../app/zookeeper-3.8.4-standalone/run.md) | [说明](../app/zookeeper-3.8.4-standalone) | +| Zookeeper | 3.8.4 三节点集群 | [`zookeeper-3.8.4-cluster`](../app/zookeeper-3.8.4-cluster/run.md) | [说明](../app/zookeeper-3.8.4-cluster) | +| Zookeeper | 3.9.3 单机 | [`zookeeper-3.9.3-standalone`](../app/zookeeper-3.9.3-standalone/run.md) | [说明](../app/zookeeper-3.9.3-standalone) | +| Zookeeper | 3.9.3 三节点集群 | [`zookeeper-3.9.3-cluster`](../app/zookeeper-3.9.3-cluster/run.md) | [说明](../app/zookeeper-3.9.3-cluster) | +| RocketMQ | 4.9.6 单机 | [`rocketmq-4.9.6-standalone`](../app/rocketmq-4.9.6-standalone/run.md) | [说明](../app/rocketmq-4.9.6-standalone) | +| RocketMQ | 4.9.6 单集群 1 主 2 从 | [`rocketmq-4.9.6-cluster-1m2s`](../app/rocketmq-4.9.6-cluster-1m2s/run.md) | [说明](../app/rocketmq-4.9.6-cluster-1m2s) | +| RocketMQ | 4.9.6 双主 | [`rocketmq-4.9.6-cluster-2m`](../app/rocketmq-4.9.6-cluster-2m/run.md) | [说明](../app/rocketmq-4.9.6-cluster-2m) | +| EFK | ES / Kibana / Filebeat 7.14.1 | [`efk`](../app/efk/run.md) | [说明](../app/efk) | +| SkyWalking | 9.5.0 + ES 7.14.1 | [`skywalking-9.5.0-es`](../app/skywalking-9.5.0-es/run.md) | [说明](../app/skywalking-9.5.0-es) | +| SkyWalking | 9.5.0 + MySQL 8.0 | [`skywalking-9.5.0-mysql`](../app/skywalking-9.5.0-mysql/run.md) | [说明](../app/skywalking-9.5.0-mysql) | +| SkyWalking | 9.5.0 接入端(Java Agent 8.15.0) | [`skywalking-9.5.0-agent`](../app/skywalking-9.5.0-agent/README.md) | [说明](../app/skywalking-9.5.0-agent) | +| SkyWalking | 9.7.0 + ES 7.14.1 | [`skywalking-9.7.0-es`](../app/skywalking-9.7.0-es/run.md) | [说明](../app/skywalking-9.7.0-es) | +| SkyWalking | 9.7.0 + MySQL 8.0 | [`skywalking-9.7.0-mysql`](../app/skywalking-9.7.0-mysql/run.md) | [说明](../app/skywalking-9.7.0-mysql) | +| SkyWalking | 9.7.0 接入端(Java Agent 9.1.0) | [`skywalking-9.7.0-agent`](../app/skywalking-9.7.0-agent/README.md) | [说明](../app/skywalking-9.7.0-agent) | +| SkyWalking | 10.0.1 + ES 7.14.1 | [`skywalking-10.0.1-es`](../app/skywalking-10.0.1-es/run.md) | [说明](../app/skywalking-10.0.1-es) | +| SkyWalking | 10.0.1 + MySQL 8.0 | [`skywalking-10.0.1-mysql`](../app/skywalking-10.0.1-mysql/run.md) | [说明](../app/skywalking-10.0.1-mysql) | +| SkyWalking | 10.0.1 接入端(Java Agent 9.3.0) | [`skywalking-10.0.1-agent`](../app/skywalking-10.0.1-agent/README.md) | [说明](../app/skywalking-10.0.1-agent) | +| Tengine | 3.1.0 反代示例 | [`tengine-3.1.0`](../app/tengine-3.1.0/run.md) | [说明](../app/tengine-3.1.0) | 同版本的 ES / MySQL / Agent 三种形态目录并列,按需选择其一部署;ES 形态与 MySQL 形态端口相同,不要同时启动。 diff --git a/top/image/alinux3-update20261111/Dockerfile b/image/alinux3-update20261111/Dockerfile similarity index 100% rename from top/image/alinux3-update20261111/Dockerfile rename to image/alinux3-update20261111/Dockerfile diff --git a/top/image/alinux3-update20261111/build.sh b/image/alinux3-update20261111/build.sh similarity index 100% rename from top/image/alinux3-update20261111/build.sh rename to image/alinux3-update20261111/build.sh diff --git a/top/image/compile-dotnet6/Dockerfile b/image/compile-dotnet6/Dockerfile similarity index 100% rename from top/image/compile-dotnet6/Dockerfile rename to image/compile-dotnet6/Dockerfile diff --git a/top/image/compile-dotnet6/build.sh b/image/compile-dotnet6/build.sh similarity index 100% rename from top/image/compile-dotnet6/build.sh rename to image/compile-dotnet6/build.sh diff --git a/top/image/compile-dotnet6/demo/.dockerignore b/image/compile-dotnet6/demo/.dockerignore similarity index 100% rename from top/image/compile-dotnet6/demo/.dockerignore rename to image/compile-dotnet6/demo/.dockerignore diff --git a/top/image/compile-dotnet6/demo/.gitignore b/image/compile-dotnet6/demo/.gitignore similarity index 100% rename from top/image/compile-dotnet6/demo/.gitignore rename to image/compile-dotnet6/demo/.gitignore diff --git a/top/image/compile-dotnet6/demo/Demo.csproj b/image/compile-dotnet6/demo/Demo.csproj similarity index 100% rename from top/image/compile-dotnet6/demo/Demo.csproj rename to image/compile-dotnet6/demo/Demo.csproj diff --git a/top/image/compile-dotnet6/demo/Dockerfile b/image/compile-dotnet6/demo/Dockerfile similarity index 100% rename from top/image/compile-dotnet6/demo/Dockerfile rename to image/compile-dotnet6/demo/Dockerfile diff --git a/top/image/compile-dotnet6/demo/Program.cs b/image/compile-dotnet6/demo/Program.cs similarity index 100% rename from top/image/compile-dotnet6/demo/Program.cs rename to image/compile-dotnet6/demo/Program.cs diff --git a/top/image/compile-dotnet6/demo/build.sh b/image/compile-dotnet6/demo/build.sh similarity index 100% rename from top/image/compile-dotnet6/demo/build.sh rename to image/compile-dotnet6/demo/build.sh diff --git a/top/image/compile-dotnet6/demo/docker-compose.yml b/image/compile-dotnet6/demo/docker-compose.yml similarity index 100% rename from top/image/compile-dotnet6/demo/docker-compose.yml rename to image/compile-dotnet6/demo/docker-compose.yml diff --git a/top/image/compile-dotnet6/demo/install.sh b/image/compile-dotnet6/demo/install.sh similarity index 100% rename from top/image/compile-dotnet6/demo/install.sh rename to image/compile-dotnet6/demo/install.sh diff --git a/top/image/compile-dotnet6/demo/run.md b/image/compile-dotnet6/demo/run.md similarity index 97% rename from top/image/compile-dotnet6/demo/run.md rename to image/compile-dotnet6/demo/run.md index a32f0ca..49b4cbb 100644 --- a/top/image/compile-dotnet6/demo/run.md +++ b/image/compile-dotnet6/demo/run.md @@ -5,7 +5,7 @@ | 阶段 | 镜像 | 说明 | |----|-------------------------------------------------------------|-----------------------------| | 编译 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-dotnet6` | 含 SDK 6.0.427(见上级 `Dockerfile`) | -| 运行 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-dotnet6` | 仅含 ASP.NET Core 运行时 6.0.35(见 `top/image/runtime-dotnet6`) | +| 运行 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-dotnet6` | 仅含 ASP.NET Core 运行时 6.0.35(见 `image/runtime-dotnet6`) | 编译环境镜像带 SDK 和整套编译工具链(体积大),只在构建阶段使用;运行阶段只拷贝 `dotnet publish` 的产物, 镜像里不带 SDK、源码和中间文件。 diff --git a/top/image/compile-dotnet6/demo/shutdown.sh b/image/compile-dotnet6/demo/shutdown.sh similarity index 100% rename from top/image/compile-dotnet6/demo/shutdown.sh rename to image/compile-dotnet6/demo/shutdown.sh diff --git a/top/image/compile-dotnet8/Dockerfile b/image/compile-dotnet8/Dockerfile similarity index 100% rename from top/image/compile-dotnet8/Dockerfile rename to image/compile-dotnet8/Dockerfile diff --git a/top/image/compile-dotnet8/build.sh b/image/compile-dotnet8/build.sh similarity index 100% rename from top/image/compile-dotnet8/build.sh rename to image/compile-dotnet8/build.sh diff --git a/top/image/compile-dotnet9/Dockerfile b/image/compile-dotnet9/Dockerfile similarity index 100% rename from top/image/compile-dotnet9/Dockerfile rename to image/compile-dotnet9/Dockerfile diff --git a/top/image/compile-dotnet9/build.sh b/image/compile-dotnet9/build.sh similarity index 100% rename from top/image/compile-dotnet9/build.sh rename to image/compile-dotnet9/build.sh diff --git a/top/image/proxy-tengine3/Dockerfile b/image/proxy-tengine3/Dockerfile similarity index 100% rename from top/image/proxy-tengine3/Dockerfile rename to image/proxy-tengine3/Dockerfile diff --git a/top/image/proxy-tengine3/build.sh b/image/proxy-tengine3/build.sh similarity index 100% rename from top/image/proxy-tengine3/build.sh rename to image/proxy-tengine3/build.sh diff --git a/top/image/proxy-tengine3/nginx.conf b/image/proxy-tengine3/nginx.conf similarity index 100% rename from top/image/proxy-tengine3/nginx.conf rename to image/proxy-tengine3/nginx.conf diff --git a/top/image/runtime-dotnet6/Dockerfile b/image/runtime-dotnet6/Dockerfile similarity index 100% rename from top/image/runtime-dotnet6/Dockerfile rename to image/runtime-dotnet6/Dockerfile diff --git a/top/image/runtime-dotnet6/build.sh b/image/runtime-dotnet6/build.sh similarity index 100% rename from top/image/runtime-dotnet6/build.sh rename to image/runtime-dotnet6/build.sh diff --git a/top/image/runtime-dotnet8/Dockerfile b/image/runtime-dotnet8/Dockerfile similarity index 100% rename from top/image/runtime-dotnet8/Dockerfile rename to image/runtime-dotnet8/Dockerfile diff --git a/top/image/runtime-dotnet8/build.sh b/image/runtime-dotnet8/build.sh similarity index 100% rename from top/image/runtime-dotnet8/build.sh rename to image/runtime-dotnet8/build.sh diff --git a/top/image/runtime-dotnet9/Dockerfile b/image/runtime-dotnet9/Dockerfile similarity index 100% rename from top/image/runtime-dotnet9/Dockerfile rename to image/runtime-dotnet9/Dockerfile diff --git a/top/image/runtime-dotnet9/build.sh b/image/runtime-dotnet9/build.sh similarity index 100% rename from top/image/runtime-dotnet9/build.sh rename to image/runtime-dotnet9/build.sh diff --git a/top/image/runtime-jdk11/Dockerfile b/image/runtime-jdk11/Dockerfile similarity index 100% rename from top/image/runtime-jdk11/Dockerfile rename to image/runtime-jdk11/Dockerfile diff --git a/top/image/runtime-jdk11/build.sh b/image/runtime-jdk11/build.sh similarity index 100% rename from top/image/runtime-jdk11/build.sh rename to image/runtime-jdk11/build.sh diff --git a/top/image/runtime-jdk17/Dockerfile b/image/runtime-jdk17/Dockerfile similarity index 100% rename from top/image/runtime-jdk17/Dockerfile rename to image/runtime-jdk17/Dockerfile diff --git a/top/image/runtime-jdk17/build.sh b/image/runtime-jdk17/build.sh similarity index 100% rename from top/image/runtime-jdk17/build.sh rename to image/runtime-jdk17/build.sh diff --git a/top/image/runtime-jdk21/Dockerfile b/image/runtime-jdk21/Dockerfile similarity index 100% rename from top/image/runtime-jdk21/Dockerfile rename to image/runtime-jdk21/Dockerfile diff --git a/top/image/runtime-jdk21/build.sh b/image/runtime-jdk21/build.sh similarity index 100% rename from top/image/runtime-jdk21/build.sh rename to image/runtime-jdk21/build.sh diff --git a/top/image/runtime-python3/Dockerfile b/image/runtime-python3/Dockerfile similarity index 100% rename from top/image/runtime-python3/Dockerfile rename to image/runtime-python3/Dockerfile diff --git a/top/image/runtime-python3/build.sh b/image/runtime-python3/build.sh similarity index 100% rename from top/image/runtime-python3/build.sh rename to image/runtime-python3/build.sh diff --git a/top/image/runtime-python3/pip.conf b/image/runtime-python3/pip.conf similarity index 100% rename from top/image/runtime-python3/pip.conf rename to image/runtime-python3/pip.conf diff --git a/top/image/tools-ansible/Dockerfile b/image/tools-ansible/Dockerfile similarity index 100% rename from top/image/tools-ansible/Dockerfile rename to image/tools-ansible/Dockerfile diff --git a/top/image/tools-ansible/build.sh b/image/tools-ansible/build.sh similarity index 100% rename from top/image/tools-ansible/build.sh rename to image/tools-ansible/build.sh diff --git a/top/image/tools-ansible/pip.conf b/image/tools-ansible/pip.conf similarity index 100% rename from top/image/tools-ansible/pip.conf rename to image/tools-ansible/pip.conf