Merge remote-tracking branch 'origin/master'

linwei

2026-01-26 987ea094cf76800d99fb7ab7a16023e4f2d6f854

Merge remote-tracking branch 'origin/master'

 drone-service/drone-gd/docker-compose-prod.yml

@@ -1,10 +1,10 @@
version: '3.1'
services:
  drone_system:
  drone_gd:
    # 从 Harbor 私有仓库拉取镜像
    image: 172.21.81.239:32002/drone-manage/drone-gd:SNAPSHOT-$BUILD_NUMBER
    # image: drone-system:latest
    container_name: drone-system
    # image: drone-gd:latest
    container_name: drone-gd
    # 宿主机端口：容器启动端口
    ports:
      - "8106:8106"

 drone-service/drone-gd/docker-compose-test.yml

@@ -1,9 +1,9 @@
version: '3.1'
services:
  drone_system:
  drone_gd:
    # 从 Harbor 私有仓库拉取镜像
    image: 172.21.81.239:32002/drone-manage-test/drone-gd:SNAPSHOT-$BUILD_NUMBER
    # image: drone-system:latest
    # image: drone-gd:latest
    container_name: drone-gd
    # 宿主机端口：容器启动端口
    ports:

 drone-service/drone-system/docker-compose-prod.yml

@@ -1,15 +1,15 @@
version: '3.1'
services:
  drone_system:
  ja_drone_system:
    # 从 Harbor 私有仓库拉取镜像
    image: 172.21.81.239:32002/drone-manage/drone-system:SNAPSHOT-$BUILD_NUMBER
    # image: drone-system:latest
    container_name: drone-system
    image: 172.21.81.239:32002/drone-manage/ja-drone-system:SNAPSHOT-$BUILD_NUMBER
    # image: ja-drone-system:latest
    container_name: ja-drone-system
    # 宿主机端口：容器启动端口
    ports:
      - "8106:8106"
      - "8206:8206"
    volumes:
      - /app/logs/system:/data/log/system
      - /app/logs/ja-system:/data/log/system
      - /software/service/liscense:/software/service/liscense
    # 设置环境变量
    environment:

 drone-service/drone-system/docker-compose-test.yml

@@ -1,6 +1,6 @@
version: '3.1'
services:
  drone_system:
  ja_drone_system:
    # 从 Harbor 私有仓库拉取镜像
    image: 172.21.81.239:32002/drone-manage-test/ja-drone-system:SNAPSHOT-$BUILD_NUMBER
    # image: drone-system:latest