MERGE: 将video-nginx合并到nginx中去，移除container_name 等

.env.default

@@ -36,7 +36,7 @@ SERVER_HOSTNAME='' # livedvr.tripsdd.com
 
 # 使用https时, 必填, 证书文件的绝对路径, 排除.crt/.key后缀, nginx实际读取的是 ${SSL_CERTIFICATE}.crt 和 ${SSL_CERTIFICATE}.key 两个文件
 # 如果暂时没有申请到证书, 可以使用内置的假证书: /home/docker/nginx/ssl/placeholder
-# 若使用crotbot自动申请证书, 证书的路径会在日志中打印, 一般为: /data/certbot/live/${SERVER_HOSTNAME}/certificate
+# 若使用crotbot自动申请证书, 需要先单独启动一次(docker compose up crotbot), 申请到的证书路径会在日志中打印, 然后将它添加到变量中, 一般为: /data/certbot/live/${SERVER_HOSTNAME}/certificate, 
 SSL_CERTIFICATE='' # /home/docker-compose/ssl/livedvr_tripsdd_com
 
 # bus和track部署在同一台服务器上时, 需要通过域名区分两者

examples/bus-http/compose.yaml

@@ -5,9 +5,6 @@ include:
   - ../docker/rabbitmq/compose.yml
   - ../docker/redis/compose.yml
   - ../docker/bus/compose.yml
-  - path:  
-    - ../docker/video-nginx/compose.yml
-    - ../docker/video-nginx/compose.http.yml
   - path:  
     - ../docker/video/compose.yml
     - ../docker/video/compose.bus.yml
@@ -16,6 +13,8 @@ include:
     - ../docker/nginx/compose.yml
     - ../docker/nginx/compose.bus.yml
     - ../docker/nginx/compose.bus.http.yml
+    - ../docker/nginx/compose.video.yml
+    - ../docker/nginx/compose.video.http.yml
   - path:
     - ../docker/web-downloader/compose.yml
     - ../docker/web-downloader/compose.bus.yml

examples/bus-https/compose.yaml

@@ -6,7 +6,6 @@ include:
   - ../docker/rabbitmq/compose.yml
   - ../docker/redis/compose.yml
   - ../docker/bus/compose.yml
-  - ../docker/video-nginx/compose.yml
   - ../docker/certbot/compose.yml
   - path:
     - ../docker/video/compose.yml
@@ -15,6 +14,8 @@ include:
     - ../docker/nginx/compose.yml
     - ../docker/nginx/compose.bus.yml
     - ../docker/nginx/compose.bus.https.yml
+    - ../docker/nginx/compose.video.yml
+    - ../docker/nginx/compose.video.https.yml
   - path:
-    - ../docker/web-downloader/compose.yml     
+    - ../docker/web-downloader/compose.yml
     - ../docker/web-downloader/compose.bus.yml

examples/video-storage/.env

@@ -1,16 +1,16 @@
 ## 视频服务器
-VIDEO_IP=58.82.168.181
-VIDEO_HOSTNAME=livedvr.tripsdd.com
+SERVER_IP_PUBLIC=58.82.168.181
+SERVER_HOSTNAME=livedvr.tripsdd.com
 # 证书文件的绝对路径, 排除.crt/.key后缀, nginx使用的是 $VIDEO_SSL_CERTIFICATE.crt 和 $VIDEO_SSL_CERTIFICATE.key 两个文件
-VIDEO_SSL_CERTIFICATE=/home/docker-compose/ssl/livedvr_tripsdd_com
+SSL_CERTIFICATE=/home/docker/nginx/ssl/placeholder
 
 ## 网关服务器
 JTT808_HOST=103.20.204.149
 
 # RABBITMQ
-RABBITMQ_HOST=1111 # 58.82.168.181
+RABBITMQ_HOST=58.82.168.182
 RABBITMQ_PORT=5672
-RABBITMQ_PASSWORD=111 # 123
+RABBITMQ_PASSWORD=123456
 
 # MINIO
-MINIO_PASSWORD=11 # xxxxxxxxxxxxxxxx
+MINIO_PASSWORD=123456

examples/video-storage/compose.yaml

@@ -9,5 +9,7 @@ include:
     - ../docker/video/compose.yml
     - ../docker/video/compose.storage.yml
   - path:
-    - ../docker/video-nginx/compose.yml
-    - ../docker/video-nginx/compose.minio.yml
+    - ../docker/nginx/compose.yml
+    - ../docker/nginx/compose.video.yml
+    - ../docker/nginx/compose.video.https.yml
+    - ../docker/nginx/compose.video-minio.yml

examples/video-stream/.env

@@ -1,8 +1,8 @@
 ## 视频服务器
-VIDEO_IP=58.82.168.181
-VIDEO_HOSTNAME=livedvr.tripsdd.com
+SERVER_IP_PUBLIC=58.82.168.181
+SERVER_HOSTNAME=livedvr.tripsdd.com
 # 证书文件的绝对路径, 排除.crt/.key后缀, nginx使用的是 $VIDEO_SSL_CERTIFICATE.crt 和 $VIDEO_SSL_CERTIFICATE.key 两个文件
-VIDEO_SSL_CERTIFICATE=/home/docker-compose/ssl/livedvr_tripsdd_com
+SSL_CERTIFICATE=/home/docker/nginx/ssl/placeholder
 
 ## 网关服务器
-JTT808_HOST=103.20.204.149
+JTT808_HOST=103.20.204.149

examples/video-stream/compose.yaml

@@ -4,6 +4,9 @@
 # 默认开放端口: 直播9000,录像9001,对接9002, 监听9003,广播9004,RTMP9005:1935(srs)
 # Nginx代理9085-9089: http-flv(srs:8080端口), wss(rtp:9006端口), 拦截mdvr和ws关键字
 include:
-  - ../docker/video-nginx/compose.yml
+  - path:
+    - ../docker/nginx/compose.yml
+    - ../docker/nginx/compose.video.yml
+    - ../docker/nginx/compose.video.https.yml
   - path:
     - ../docker/video/compose.yml

nginx/compose.video-minio.yml

@@ -0,0 +1,12 @@
+services:
+  nginx:
+    configs:
+      - source: video-minio.conf.template
+        target: /etc/nginx/templates/video-minio.conf.template
+    environment:
+      - MINIO_HOST=${MINIO_HOST}
+      - MINIO_PORT=${MINIO_PORT}
+
+configs:
+  video-minio.conf.template:
+    file: ./conf/conf.d/video-minio.conf.template

nginx/compose.video.http.yml

@@ -0,0 +1,10 @@
+services:
+  nginx:
+    configs:
+      # 使用http的配置覆盖
+      - source: video-http.conf.template
+        target: /etc/nginx/templates/video.conf.template
+
+configs:
+  video-http.conf.template:
+    file: ./conf/conf.d/video-http.conf.template

nginx/compose.video.https.yml

@@ -0,0 +1,3 @@
+services:
+  nginx:
+    # file://./compose.video.yml 已经是https的配置了, 不需要覆写其他设置, 该文件只是为了和 file://./compose.video.http.yml 对齐

nginx/compose.video.yml

@@ -0,0 +1,37 @@
+services:
+  nginx:
+    ports:
+      # 视频直播,映射srs端口
+      - ${VIDEO_PORT_HTTPS_0}:${VIDEO_PORT_HTTPS_0}
+      - ${VIDEO_PORT_HTTPS_1}:${VIDEO_PORT_HTTPS_1}
+      - ${VIDEO_PORT_HTTPS_2}:${VIDEO_PORT_HTTPS_2}
+      - ${VIDEO_PORT_HTTPS_3}:${VIDEO_PORT_HTTPS_3}
+      - ${VIDEO_PORT_HTTPS_4}:${VIDEO_PORT_HTTPS_4}
+      - ${VIDEO_PORT_HTTPS_5}:${VIDEO_PORT_HTTPS_5}
+    depends_on:
+      - srs
+      - rtp
+    secrets:
+      - video-ssl-certificate
+      - video-ssl-certificate-key
+    configs:
+      # 默认启动https的配置
+      - source: video-https.conf.template
+        target: /etc/nginx/templates/video.conf.template
+    environment:
+      - VIDEO_PORT_HTTPS_0=${VIDEO_PORT_HTTPS_0}
+      - VIDEO_PORT_HTTPS_1=${VIDEO_PORT_HTTPS_1}
+      - VIDEO_PORT_HTTPS_2=${VIDEO_PORT_HTTPS_2}
+      - VIDEO_PORT_HTTPS_3=${VIDEO_PORT_HTTPS_3}
+      - VIDEO_PORT_HTTPS_4=${VIDEO_PORT_HTTPS_4}
+      - VIDEO_PORT_HTTPS_5=${VIDEO_PORT_HTTPS_5}
+
+secrets:
+  video-ssl-certificate:
+    file: ${VIDEO_SSL_CERTIFICATE:?required}.crt
+  video-ssl-certificate-key:
+    file: ${VIDEO_SSL_CERTIFICATE:?required}.key
+
+configs:
+  video-https.conf.template:
+    file: ./conf/conf.d/video-https.conf.template