diff --git a/.gitignore b/.gitignore index c9a6d07..2088d95 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,12 @@ replay_pid* # macOS .DS_Store + +# 部署目录的运行产物(ES/MySQL/Nacos/RocketMQ 等数据目录与日志) +deploy/*/elasticsearch/data/ +deploy/*/elasticsearch/logs/ +deploy/*/mysql/data/ +deploy/*/nacos*/logs/ +deploy/*/broker*/store/ +deploy/*/master/store/ +deploy/*/filebeat/logs/ diff --git a/deploy/skywalking-10.0.1-es/docker-compose.yml b/deploy/skywalking-10.0.1-es/docker-compose.yml index 0598660..97891b1 100644 --- a/deploy/skywalking-10.0.1-es/docker-compose.yml +++ b/deploy/skywalking-10.0.1-es/docker-compose.yml @@ -36,7 +36,7 @@ services: ipv4_address: 172.24.0.83 oap: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-oap-server:10.0.1 # 原镜像`apache/skywalking-oap-server:10.0.1` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-oap-server-10.0.1 # 原镜像`apache/skywalking-oap-server:10.0.1` container_name: oap restart: unless-stopped privileged: true @@ -51,8 +51,15 @@ services: ports: - "11800:11800" # agent 上报数据的端口,这是 gRPC 端口 - "12800:12800" # ui 读取数据的端口, 这是 http 端口 + healthcheck: # 容器内没有 curl,用 bash 的 /dev/tcp 探测 HTTP 端口是否可连 + test: ["CMD-SHELL", "timeout 2 bash -c 'echo > /dev/tcp/127.0.0.1/12800' || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 60s # OAP 首次建索引/模板较慢,留足冷启动时间 depends_on: - - elasticsearch + elasticsearch: + condition: service_started links: - elasticsearch networks: @@ -61,18 +68,19 @@ services: # 可视化界面 oap-ui: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-ui:10.0.1 # 原镜像`apache/skywalking-ui:10.0.1` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-ui-10.0.1 # 原镜像`apache/skywalking-ui:10.0.1` container_name: oap-ui restart: unless-stopped privileged: true depends_on: - - oap + oap: + condition: service_healthy # 等 OAP 的 12800 端口就绪再启动,避免启动期 Connection refused links: - oap ports: - "18080:8080" environment: - SW_OAP_ADDRESS: http://172.24.0.81:12800 + SW_OAP_ADDRESS: http://oap:12800 # 用服务名,避免依赖固定 IP TZ: Asia/Shanghai networks: skywalking: diff --git a/deploy/skywalking-10.0.1-mysql/docker-compose.yml b/deploy/skywalking-10.0.1-mysql/docker-compose.yml index 90e6661..6bda1e0 100644 --- a/deploy/skywalking-10.0.1-mysql/docker-compose.yml +++ b/deploy/skywalking-10.0.1-mysql/docker-compose.yml @@ -28,11 +28,17 @@ services: user: root ports: # 映射端口 - "3308:3306" + healthcheck: # OAP 启动时会立即建表,等 MySQL 可接受查询后再启动 + test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -proot --silent || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 30s # 首次初始化数据目录较慢 networks: skywalking: ipv4_address: 172.24.0.80 oap: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-oap-server:10.0.1 # 原镜像`apache/skywalking-oap-server:10.0.1` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-oap-server-10.0.1 # 原镜像`apache/skywalking-oap-server:10.0.1` container_name: oap restart: unless-stopped environment: @@ -40,7 +46,7 @@ services: JAVA_OPTS: "-Xmx2048M -Xms2048M" SW_STORAGE: mysql # tips: 需等待自动创建60张表... - SW_JDBC_URL: "jdbc:mysql://172.24.0.80:3306/skywalking?rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false" + SW_JDBC_URL: "jdbc:mysql://mysql:3306/skywalking?rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false" SW_DATA_SOURCE_USER: root SW_DATA_SOURCE_PASSWORD: root volumes: @@ -49,17 +55,27 @@ services: ports: - "11800:11800" # agent 上报数据的端口,这是 gRPC 端口 - "12800:12800" # ui 读取数据的端口, 这是 http 端口 + healthcheck: # 容器内没有 curl,用 bash 的 /dev/tcp 探测 HTTP 端口是否可连 + test: ["CMD-SHELL", "timeout 2 bash -c 'echo > /dev/tcp/127.0.0.1/12800' || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 60s # 首次建表较慢,留足冷启动时间 + depends_on: + mysql: + condition: service_healthy networks: skywalking: ipv4_address: 172.24.0.81 # 可视化界面 oap-ui: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-ui:10.0.1 # 原镜像`apache/skywalking-ui:10.0.1` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-ui-10.0.1 # 原镜像`apache/skywalking-ui:10.0.1` container_name: oap-ui restart: unless-stopped depends_on: - - oap + oap: + condition: service_healthy # 等 OAP 的 12800 端口就绪再启动,避免启动期 Connection refused links: - oap ports: @@ -67,7 +83,7 @@ services: environment: TZ: Asia/Shanghai SW_SERVER_PORT: 8080 # 设置SkyWalking UI的监听端口 - SW_OAP_ADDRESS: http://172.24.0.81:12800 # SkyWalking OAP服务器的地址和端口 + SW_OAP_ADDRESS: http://oap:12800 # 用服务名,避免依赖固定 IP networks: skywalking: ipv4_address: 172.24.0.82 diff --git a/deploy/skywalking-9.5.0-es/docker-compose.yml b/deploy/skywalking-9.5.0-es/docker-compose.yml index 34e4482..7c81398 100644 --- a/deploy/skywalking-9.5.0-es/docker-compose.yml +++ b/deploy/skywalking-9.5.0-es/docker-compose.yml @@ -36,7 +36,7 @@ services: ipv4_address: 172.24.0.83 oap: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-oap-server:9.5.0 # 原镜像`apache/skywalking-oap-server:9.5.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-oap-server-9.5.0 # 原镜像`apache/skywalking-oap-server:9.5.0` container_name: oap restart: unless-stopped privileged: true @@ -51,8 +51,15 @@ services: ports: - "11800:11800" # agent 上报数据的端口,这是 gRPC 端口 - "12800:12800" # ui 读取数据的端口, 这是 http 端口 + healthcheck: # 容器内没有 curl,用 bash 的 /dev/tcp 探测 HTTP 端口是否可连 + test: ["CMD-SHELL", "timeout 2 bash -c 'echo > /dev/tcp/127.0.0.1/12800' || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 60s # OAP 首次建索引/模板较慢,留足冷启动时间 depends_on: - - elasticsearch + elasticsearch: + condition: service_started links: - elasticsearch networks: @@ -61,18 +68,19 @@ services: # 可视化界面 oap-ui: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-ui:9.5.0 # 原镜像`apache/skywalking-ui:9.5.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-ui-9.5.0 # 原镜像`apache/skywalking-ui:9.5.0` container_name: oap-ui restart: unless-stopped privileged: true depends_on: - - oap + oap: + condition: service_healthy # 等 OAP 的 12800 端口就绪再启动,避免启动期 Connection refused links: - oap ports: - "18080:8080" environment: - SW_OAP_ADDRESS: http://172.24.0.81:12800 + SW_OAP_ADDRESS: http://oap:12800 # 用服务名,避免依赖固定 IP TZ: Asia/Shanghai networks: skywalking: diff --git a/deploy/skywalking-9.5.0-mysql/docker-compose.yml b/deploy/skywalking-9.5.0-mysql/docker-compose.yml index ce40e98..c9ba754 100644 --- a/deploy/skywalking-9.5.0-mysql/docker-compose.yml +++ b/deploy/skywalking-9.5.0-mysql/docker-compose.yml @@ -28,11 +28,17 @@ services: user: root ports: # 映射端口 - "3308:3306" + healthcheck: # OAP 启动时会立即建表,等 MySQL 可接受查询后再启动 + test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -proot --silent || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 30s # 首次初始化数据目录较慢 networks: skywalking: ipv4_address: 172.24.0.80 oap: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-oap-server:9.5.0 # 原镜像`apache/skywalking-oap-server:9.5.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-oap-server-9.5.0 # 原镜像`apache/skywalking-oap-server:9.5.0` container_name: oap restart: unless-stopped environment: @@ -40,7 +46,7 @@ services: JAVA_OPTS: "-Xmx2048M -Xms2048M" SW_STORAGE: mysql # tips: 需等待自动创建60张表... - SW_JDBC_URL: "jdbc:mysql://172.24.0.80:3306/skywalking?rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false" + SW_JDBC_URL: "jdbc:mysql://mysql:3306/skywalking?rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false" SW_DATA_SOURCE_USER: root SW_DATA_SOURCE_PASSWORD: root volumes: @@ -49,17 +55,27 @@ services: ports: - "11800:11800" # agent 上报数据的端口,这是 gRPC 端口 - "12800:12800" # ui 读取数据的端口, 这是 http 端口 + healthcheck: # 容器内没有 curl,用 bash 的 /dev/tcp 探测 HTTP 端口是否可连 + test: ["CMD-SHELL", "timeout 2 bash -c 'echo > /dev/tcp/127.0.0.1/12800' || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 60s # 首次建表较慢,留足冷启动时间 + depends_on: + mysql: + condition: service_healthy networks: skywalking: ipv4_address: 172.24.0.81 # 可视化界面 oap-ui: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-ui:9.5.0 # 原镜像`apache/skywalking-ui:9.5.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-ui-9.5.0 # 原镜像`apache/skywalking-ui:9.5.0` container_name: oap-ui restart: unless-stopped depends_on: - - oap + oap: + condition: service_healthy # 等 OAP 的 12800 端口就绪再启动,避免启动期 Connection refused links: - oap ports: @@ -67,7 +83,7 @@ services: environment: TZ: Asia/Shanghai SW_SERVER_PORT: 8080 # 设置SkyWalking UI的监听端口 - SW_OAP_ADDRESS: http://172.24.0.81:12800 # SkyWalking OAP服务器的地址和端口 + SW_OAP_ADDRESS: http://oap:12800 # 用服务名,避免依赖固定 IP networks: skywalking: ipv4_address: 172.24.0.82 diff --git a/deploy/skywalking-9.7.0-es/docker-compose.yml b/deploy/skywalking-9.7.0-es/docker-compose.yml index 921f50d..4410bc0 100644 --- a/deploy/skywalking-9.7.0-es/docker-compose.yml +++ b/deploy/skywalking-9.7.0-es/docker-compose.yml @@ -36,7 +36,7 @@ services: ipv4_address: 172.24.0.83 oap: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-oap-server:9.7.0 # 原镜像`apache/skywalking-oap-server:9.7.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-oap-server-9.7.0 # 原镜像`apache/skywalking-oap-server:9.7.0` container_name: oap restart: unless-stopped privileged: true @@ -51,8 +51,15 @@ services: ports: - "11800:11800" # agent 上报数据的端口,这是 gRPC 端口 - "12800:12800" # ui 读取数据的端口, 这是 http 端口 + healthcheck: # 容器内没有 curl,用 bash 的 /dev/tcp 探测 HTTP 端口是否可连 + test: ["CMD-SHELL", "timeout 2 bash -c 'echo > /dev/tcp/127.0.0.1/12800' || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 60s # OAP 首次建索引/模板较慢,留足冷启动时间 depends_on: - - elasticsearch + elasticsearch: + condition: service_started links: - elasticsearch networks: @@ -61,18 +68,19 @@ services: # 可视化界面 oap-ui: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-ui:9.7.0 # 原镜像`apache/skywalking-ui:9.7.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-ui-9.7.0 # 原镜像`apache/skywalking-ui:9.7.0` container_name: oap-ui restart: unless-stopped privileged: true depends_on: - - oap + oap: + condition: service_healthy # 等 OAP 的 12800 端口就绪再启动,避免启动期 Connection refused links: - oap ports: - "18080:8080" environment: - SW_OAP_ADDRESS: http://172.24.0.81:12800 + SW_OAP_ADDRESS: http://oap:12800 # 用服务名,避免依赖固定 IP TZ: Asia/Shanghai networks: skywalking: diff --git a/deploy/skywalking-9.7.0-mysql/docker-compose.yml b/deploy/skywalking-9.7.0-mysql/docker-compose.yml index a86ff6f..8b29bc1 100644 --- a/deploy/skywalking-9.7.0-mysql/docker-compose.yml +++ b/deploy/skywalking-9.7.0-mysql/docker-compose.yml @@ -28,11 +28,17 @@ services: user: root ports: # 映射端口 - "3308:3306" + healthcheck: # OAP 启动时会立即建表,等 MySQL 可接受查询后再启动 + test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -proot --silent || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 30s # 首次初始化数据目录较慢 networks: skywalking: ipv4_address: 172.24.0.80 oap: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-oap-server:9.7.0 # 原镜像`apache/skywalking-oap-server:9.7.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-oap-server-9.7.0 # 原镜像`apache/skywalking-oap-server:9.7.0` container_name: oap restart: unless-stopped environment: @@ -40,7 +46,7 @@ services: JAVA_OPTS: "-Xmx2048M -Xms2048M" SW_STORAGE: mysql # tips: 需等待自动创建60张表... - SW_JDBC_URL: "jdbc:mysql://172.24.0.80:3306/skywalking?rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false" + SW_JDBC_URL: "jdbc:mysql://mysql:3306/skywalking?rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false" SW_DATA_SOURCE_USER: root SW_DATA_SOURCE_PASSWORD: root volumes: @@ -49,17 +55,27 @@ services: ports: - "11800:11800" # agent 上报数据的端口,这是 gRPC 端口 - "12800:12800" # ui 读取数据的端口, 这是 http 端口 + healthcheck: # 容器内没有 curl,用 bash 的 /dev/tcp 探测 HTTP 端口是否可连 + test: ["CMD-SHELL", "timeout 2 bash -c 'echo > /dev/tcp/127.0.0.1/12800' || exit 1"] + interval: 10s + timeout: 5s + retries: 30 + start_period: 60s # 首次建表较慢,留足冷启动时间 + depends_on: + mysql: + condition: service_healthy networks: skywalking: ipv4_address: 172.24.0.81 # 可视化界面 oap-ui: - image: registry.cn-shanghai.aliyuncs.com/odboy/skywalking-ui:9.7.0 # 原镜像`apache/skywalking-ui:9.7.0` + image: registry.cn-shanghai.aliyuncs.com/odboy/thirdrepo:apache-skywalking-ui-9.7.0 # 原镜像`apache/skywalking-ui:9.7.0` container_name: oap-ui restart: unless-stopped depends_on: - - oap + oap: + condition: service_healthy # 等 OAP 的 12800 端口就绪再启动,避免启动期 Connection refused links: - oap ports: @@ -67,7 +83,7 @@ services: environment: TZ: Asia/Shanghai SW_SERVER_PORT: 8080 # 设置SkyWalking UI的监听端口 - SW_OAP_ADDRESS: http://172.24.0.81:12800 # SkyWalking OAP服务器的地址和端口 + SW_OAP_ADDRESS: http://oap:12800 # 用服务名,避免依赖固定 IP networks: skywalking: ipv4_address: 172.24.0.82