feat: 数据库脚本和数据分开 & 锁定前后端版本号

.env.default

@@ -6,8 +6,6 @@ SERVER_IP_INTERNAL='' # 127.0.0.1
 # 服务器域名
 SERVER_HOSTNAME='' # livedvr.tripsdd.com
 SSL_CERTIFICATE='' # /home/docker-compose/ssl/livedvr_tripsdd_com
-# 数据目录
-DATA_DIR=/data
 
 # bus和track部署在同一台服务器上时, 需要通过域名区分两者
 BUS_HOSTNAME=${SERVER_HOSTNAME}
@@ -16,14 +14,35 @@ TRACK_HOSTNAME=${SERVER_HOSTNAME}
 TRACK_SSL_CERTIFICATE=${SSL_CERTIFICATE}
 
 #---------------------------------------------
-# 前端配置
+## 前端配置
 WEB_PORT_HTTP=80
 WEB_PORT_HTTPS=443
 WEB_BASE_URL='' # https://livedvr.tripsdd.com
 #---------------------------------------------
 
+## 目录
+# 数据目录, 用于存放日志/数据库/文件等
+DATA_DIR=/data
+# docker仓库的目录, 不建议在compose文件中引用docker仓库的绝对路径, 建议使用configs替代: https://docs.docker.com/reference/compose-file/configs/
+DOCKER_DIR=/home/docker
+
+## 版本号, 设为latest则使用最新版
+# bus前端版本
+BUS_WEB_VERSION=5.30.0
+# bus的后端, gateway-web和gateway-dispatch共用一个版本号
+BUS_GATEWAY_VERSION=1.21.1
+BUS_GATEWAY_808_2019_VERSION=25.8.25
+BUS_GATEWAY_JSATL12_VERSION=23.1.21
+BUS_GATEWAY_CALCULATION_VERSION=1.17.0
+# track前端版本
+TRACK_WEB_VERSION=1.53.0
+TRACK_MAINTAIN_VERSION=1.45.0
+TRACK_JTT808_VERSION=1.18.0
+
+# ---------------------------------------------
+
 ## 视频服务器
-#  必填, 视频外网IP, APP客户端和设备连接
+# 必填, 视频外网IP, APP客户端和设备连接
 VIDEO_IP=${SERVER_IP_PUBLIC}
 # 必填
 VIDEO_HOSTNAME=${SERVER_HOSTNAME} # livedvr.tripsdd.com
@@ -53,12 +72,9 @@ VIDEO_PORT_HTTPS_5=9089
 #---------------------------------------------
 
 ## 网关服务器
-
 # 必填, 后端和流媒体服务往网关服务器注册或者下发指令
 # 单机部署推荐别名jtt808，内网多服务器部署推荐内网IP, 外网部署使用外网IP
 JTT808_HOST='jtt808' # jtt808 | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}
-
-## 808网关
 JTT808_IP=${SERVER_IP_PUBLIC} # 默认使用服务器外网IP,设备使用
 JTT808_PORT=9011
 JTT808_PORT_HTTP=9012

bus/compose.yml

@@ -1,6 +1,6 @@
 services:
   gateway_808_2019:
-    image: transcodegroup/gateway-808-2019:latest
+    image: transcodegroup/gateway-808-2019:${BUS_GATEWAY_808_2019_VERSION:?required}
     container_name: gateway_808_2019
     restart: always
     volumes:
@@ -53,7 +53,7 @@ services:
 
   # spring-boot后端
   gateway_web:
-    image: transcodegroup/gateway-web
+    image: transcodegroup/gateway-web:${BUS_GATEWAY_VERSION:?required}
     container_name: gateway_web
     restart: always
     volumes:
@@ -104,7 +104,7 @@ services:
 
   # spring-boot调度
   gateway_dispatch:
-    image: transcodegroup/gateway-dispatch
+    image: transcodegroup/gateway-dispatch:${BUS_GATEWAY_VERSION:?required}
     container_name: gateway_dispatch
     restart: always
     volumes:
@@ -152,7 +152,7 @@ services:
         max-size: "100m"
   # 主动安全
   gateway_jsatl12:
-    image: transcodegroup/gateway-jsatl12
+    image: transcodegroup/gateway-jsatl12:${BUS_GATEWAY_JSATL12_VERSION:?required}
     container_name: gateway_jsatl12
     restart: always
     ports:
@@ -178,7 +178,7 @@ services:
         # 限制日志文件大小
         max-size: "100m"
   gateway_calculation:
-    image: transcodegroup/gateway-calculation
+    image: transcodegroup/gateway-calculation:${BUS_GATEWAY_CALCULATION_VERSION:?required}
     container_name: gateway_calculation
     restart: always
     volumes:

jtt808/compose.yml

@@ -1,6 +1,6 @@
 services:
   jtt808:
-    image: transcodegroup/jtt808-server:latest
+    image: transcodegroup/jtt808-server:${TRACK_JTT808_VERSION:?required}
     container_name: jtt808_server
     restart: always
     ports:

maintain/compose.yml

@@ -1,11 +1,11 @@
 services:
   maintain:
-    image: transcodegroup/maintain-server
+    image: transcodegroup/maintain-server:${TRACK_MAINTAIN_VERSION:?required}
     container_name: maintain
     restart: always
     volumes:
       - /etc/localtime:/etc/localtime
-      - ${MAINTAIN_TOKEN_DIR:-/home/docker-compose/token}:/home/token
+      - ${MAINTAIN_TOKEN_DIR:?required}:/home/token
       - ${DATA_DIR:-/data}/logs/maintain:/logs
       - ${DATA_DIR:-/data}/fonts:/data/fonts
     ports:

projects/teamcity-download-artifact.sh

@@ -12,7 +12,7 @@ print_help() {
   echo "Usage: $bin_name --build=<build> [--tag=<tag>]"
   echo
   echo "--build: 构建的名称, 例如: MaintainVbenAdmin_Release, 必填"
-  echo "--tag: 标签名, 若不填, 则下载最后一次的构建"
+  echo "--tag: 标签名, 默认为latest, 下载最后一次的构建"
   echo
   echo "示例:"
   echo
@@ -41,7 +41,7 @@ if [ -z "$BUILD" ]; then
   exit 1
 fi
 
-if [ -n "$TAG" ]; then
+if [ -n "$TAG" ] && [ "$TAG" != "latest" ]; then
   # locator的value包含`/`时, 需要进行base64编码
   # @see https://www.jetbrains.com/help/teamcity/rest/locators.html#e20589c5
   encoded_tag="$(printf '%s' "tags/$TAG" | base64)"

video-nginx/compose.yml

@@ -19,11 +19,11 @@ services:
       - video-ssl-certificate
       - video-ssl-certificate-key
     volumes:
-      #- "/home/docker/video-nginx/conf/nginx.conf:/etc/nginx/nginx.conf"
+      #- "${DOCKER_DIR:-/home/docker}/video-nginx/conf/nginx.conf:/etc/nginx/nginx.conf"
       # 使用配置文件模板, 后缀需要是.conf.tempalte
       # https://hub.docker.com/_/nginx#:~:text=Using%20environment%20variables
-      #- "/home/docker/video-nginx/conf/conf.d:/etc/nginx/templates"
-      - "/home/docker/video-nginx/html:/usr/share/nginx/html"
+      #- "${DOCKER_DIR:-/home/docker}/video-nginx/conf/conf.d:/etc/nginx/templates"
+      - "${DOCKER_DIR:-/home/docker}/video-nginx/html:/usr/share/nginx/html"
       - "${DATA_DIR:-/data}/logs/video-nginx:/var/log/nginx"
     configs:
       - source: nginx.conf

video/compose.storage.yaml

@@ -1,7 +1,7 @@
 services:
   srs:
     volumes:
-      - "/home/docker/video/srs-storage/conf:/usr/local/srs/conf"
+      - "${DOCKER_DIR:-/home/docker}/video/srs-storage/conf:/usr/local/srs/conf"
       - "${DATA_DIR:-/data}/srs-storage/html:/usr/local/srs/objs/nginx/html"
   rtp:
     volumes:

video/compose.yml

@@ -11,7 +11,7 @@ services:
       # http-flv/hls端口,建议nginx代理, 内部别名访问
       #- 8080:8080
     volumes:
-      - "/home/docker/video/srs/conf:/usr/local/srs/conf"
+      - "${DOCKER_DIR:-/home/docker}/video/srs/conf:/usr/local/srs/conf"
       - "${DATA_DIR:-/data}/srs/html:/usr/local/srs/objs/nginx/html"
     ulimits:
       nproc: 65535

video/srs-storage/conf/docker.conf

@@ -32,11 +32,10 @@ vhost __defaultVhost__ {
         # 启用http-flv
         enabled     on;
         mount       [vhost]/[app]/[stream].flv;
-        # 不猜测音视频 天迈的流会丢音频
-        drop_if_not_match off;
-        has_audio on;
-        has_video on;
-        guess_has_av off;
+        has_audio off;           # 允许没有音频（或中途音频丢失/静音）
+        has_video on;            # 要求必须有视频（一般默认就是 on）
+        drop_if_not_match off;   # 不因为音视频结构不完整就丢弃连接
+        guess_has_av on;         # 启用智能判断，容忍前几帧无音频
     }
 
     tcp_nodelay     on;