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

* refactor: 将video-nginx的配置迁移到nginx中

wip: 迁移时, 覆写错误

* fix: 更新example, 修复config检查错误

wip: 更新examples

docs: 让examples的config检查都不报错

* fix: minio改成动态解析域名, 防止启动顺序导致的403错误

fix: minio改成动态解析域名

wip: video-minio中minio的域名也需要动态解析

* perf: 移除container_name, 使用默认的 $projectName + $serviceName + 1 的形式

不写死容器名, 可以方便启动多个组合的compose, 方便测试examples中各各组合的效果

* perf: 给nginx的几个覆写, 添加依赖关系

* Revert "fix: minio改成动态解析域名, 防止启动顺序导致的403错误"

This reverts commit 1abc368.

* perf: track的demo添加video

* refactor: 默认https, 需要http的时候再覆写

之前配置的*.https.yml, 覆写证书的方式还是需要填写证书变量, 故删除, 改回手动填写占位证书

---------

Co-authored-by: ipcjs.mac4 <gipcjs@gmail.com>
Co-authored-by: cli <cli@debian>
Co-authored-by: th-ci <root@tg.th-ci>

Author: 4 people

.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/bus-https/ssl/tg_com.crt

@@ -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/bus-https/ssl/tg_com.key

@@ -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