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

.env.default

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

README.md

@@ -18,9 +18,10 @@ git clone https://github.com/TranscodeGroup/docker.git /home/docker
 
 **单机单独部署**:
 
-- [bus-http](./examples/bus-http/compose.yaml): Bus-http单机部署
-- [bus-https](./examples/bus-https/compose.yaml): Bus-https单机部署
-- [track-https](./examples/track-https/compose.yaml): Tracker V2单机部署
+- [bus-http](./examples/bus-http/compose.yaml): Bus http单机部署
+- [bus-https](./examples/bus-https/compose.yaml): Bus https单机部署
+- [track-http](./examples/track-http/compose.yaml): Tracker V2 http单机部署
+- [track-https](./examples/track-https/compose.yaml): Tracker V2 https单机部署
 
 **分布式部署**:
 

bus/compose.yml

@@ -1,7 +1,6 @@
 services:
   gateway_808_2019:
     image: transcodegroup/gateway-808-2019:${BUS_GATEWAY_808_2019_VERSION:?required}
-    container_name: gateway_808_2019
     restart: always
     volumes:
       - ${DATA_DIR:-/data}/files:/data/files
@@ -54,7 +53,6 @@ services:
   # spring-boot后端
   gateway_web:
     image: transcodegroup/gateway-web:${BUS_GATEWAY_VERSION:?required}
-    container_name: gateway_web
     restart: always
     volumes:
       - ${DATA_DIR:-/data}/files:/data/files
@@ -105,7 +103,6 @@ services:
   # spring-boot调度
   gateway_dispatch:
     image: transcodegroup/gateway-dispatch:${BUS_GATEWAY_VERSION:?required}
-    container_name: gateway_dispatch
     restart: always
     volumes:
       - ${DATA_DIR:-/data}/files:/data/files
@@ -153,7 +150,6 @@ services:
   # 主动安全
   gateway_jsatl12:
     image: transcodegroup/gateway-jsatl12:${BUS_GATEWAY_JSATL12_VERSION:?required}
-    container_name: gateway_jsatl12
     restart: always
     ports:
       - ${JTT808_PORT_FILE}:${JTT808_PORT_FILE}

examples/bus-http/.env

@@ -3,6 +3,8 @@
 SERVER_HOSTNAME='transcodegroup.cn'
 ## 公网IP
 SERVER_IP_PUBLIC='81.71.36.80'
+# 即使不使用https, 也要配置一个占位证书
+SSL_CERTIFICATE=/home/docker/nginx/ssl/placeholder
 
 #---------自定义初始密码, 建议随机生成新的替换-------------
 ## MYSQL, 必填，示例: p92oVkNxrUttUUu8qyqs

examples/bus-http/compose.yaml

@@ -5,17 +5,15 @@ 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
     - ../docker/video/compose.bus.http.yml
   - path:
     - ../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,15 +6,14 @@ 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
     - ../docker/video/compose.bus.yml
   - path:
     - ../docker/nginx/compose.yml
     - ../docker/nginx/compose.bus.yml
-    - ../docker/nginx/compose.bus.https.yml
+    - ../docker/nginx/compose.video.yml
   - path:
-    - ../docker/web-downloader/compose.yml     
+    - ../docker/web-downloader/compose.yml
     - ../docker/web-downloader/compose.bus.yml

examples/track-http/.env

@@ -0,0 +1,12 @@
+SERVER_IP_PUBLIC='58.82.168.197'
+SERVER_HOSTNAME='th-track.transcodegroup.cn'
+# 即使不使用https, 也要配置一个占位证书
+SSL_CERTIFICATE=/home/docker/nginx/ssl/placeholder
+WEB_PORT_HTTP=80
+
+MYSQL_PASSWORD='12345678'
+REDIS_PASSWORD='12345678'
+MONGODB_PASSWORD='12345678'
+RABBITMQ_PASSWORD='12345678'
+MINIO_PASSWORD='12345678'
+MAIL_PASSWORD='12345678'

examples/track-http/compose.yaml

@@ -0,0 +1,22 @@
+## V2单机部署方案, 使用http
+include:
+  - ../docker/mysql8/compose.yml
+  - ../docker/mysql-backup/compose.maintain.yml
+  - ../docker/redis/compose.yml
+  - ../docker/mongodb/compose.yml
+  - ../docker/rabbitmq/compose.yml
+  - ../docker/minio/compose.yml
+  - ../docker/maintain/compose.yml
+  - ../docker/jtt808/compose.yml
+  - path:
+    - ../docker/video/compose.yml
+    - ../docker/video/compose.storage.yml
+    - ../docker/video/compose.http.yml
+  - path:
+    - ../docker/nginx/compose.yml
+    - ../docker/nginx/compose.track.yml
+    - ../docker/nginx/compose.video.yml
+    - ../docker/nginx/compose.video.http.yml
+  - path:
+    - ../docker/web-downloader/compose.yml
+    - ../docker/web-downloader/compose.track.yml

examples/track-https/.env

@@ -1,10 +1,12 @@
 SERVER_HOSTNAME='vpn.transbustransportes.com.br'
 SERVER_IP_PUBLIC='200.155.137.26'
-SSL_CERTIFICATE=/home/docker-compose/ssl/certificate
+# 证书可以先设成placeholder, 保证compose启动起来, 申请到证书之后, 再改成实际的证书路径
+SSL_CERTIFICATE=/home/docker/nginx/ssl/placeholder
+# SSL_CERTIFICATE=/home/docker-compose/ssl/certificate
 
-MYSQL_PASSWORD='123456'
-REDIS_PASSWORD='123456'
-MONGODB_PASSWORD='123456'
-RABBITMQ_PASSWORD='123456'
-MINIO_PASSWORD='123456'
-MAIL_PASSWORD='123456'
+MYSQL_PASSWORD='12345678'
+REDIS_PASSWORD='12345678'
+MONGODB_PASSWORD='12345678'
+RABBITMQ_PASSWORD='12345678'
+MINIO_PASSWORD='12345678'
+MAIL_PASSWORD='12345678'

examples/track-https/compose.yaml

@@ -9,10 +9,11 @@ include:
   - ../docker/minio/compose.yml
   - ../docker/maintain/compose.yml
   - ../docker/jtt808/compose.yml
+  - ../docker/video/compose.yml
   - path:
     - ../docker/nginx/compose.yml
     - ../docker/nginx/compose.track.yml
-    - ../docker/nginx/compose.track.https.yml
+    - ../docker/nginx/compose.video.yml
   - path:
     - ../docker/web-downloader/compose.yml
     - ../docker/web-downloader/compose.track.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,6 @@ 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-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,8 @@
 # 默认开放端口: 直播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
   - path:
     - ../docker/video/compose.yml

jtt808/compose.yml

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

maintain/compose.yml

@@ -1,7 +1,6 @@
 services:
   maintain:
     image: transcodegroup/maintain-server:${TRACK_MAINTAIN_VERSION:?required}
-    container_name: maintain
     restart: always
     volumes:
       - /etc/localtime:/etc/localtime

minio/compose.yml

@@ -1,7 +1,6 @@
 services:
   minio:
     image: minio/minio:RELEASE.2024-08-03T04-33-23Z
-    container_name: minio
     restart: always
     ports:
        # 原生端口是9000和9001, 规避RTP服务端口冲突, 所以-1000

mongodb/compose.yml

@@ -1,6 +1,5 @@
 services:
   mongodb:
-    container_name: mongodb
     image: mongo
     restart: always
     privileged: true

mysql-backup/compose.cbus.yml

@@ -1,7 +1,6 @@
 services:
   mysql-cron-backup-cbus:
     image: fradelg/mysql-cron-backup
-    container_name: mysql-cron-backup-cbus
     volumes:
       - "${DATA_DIR:-/data}/mysql8/backup:/backup"
       - /etc/localtime:/etc/localtime:ro

mysql-backup/compose.maintain.yml

@@ -1,7 +1,6 @@
 services:
   mysql-cron-backup-maintain:
     image: fradelg/mysql-cron-backup
-    container_name: mysql-cron-backup-maintain
     volumes:
       - "${DATA_DIR:-/data}/mysql8/backup:/backup"
       - /etc/localtime:/etc/localtime:ro

mysql8/compose.yml

@@ -3,7 +3,6 @@ services:
     image: mysql:8.4
     # 国内拦了 用加速站
     #image: docker.m.daocloud.io/mysql:8.4
-    container_name: mysql8
     restart: always
     ports:
       - ${MYSQL_PORT:-3306}:3306