perf: 一般不使用DOCKER_DIR变量, 优先使用相对路径 (#53)

* perf: 一般不使用DOCKER_DIR变量, 优先使用相对路径

* wip: typo

* wip: typo

---------

Co-authored-by: ipcjs.mac4 <gipcjs@gmail.com>

Author: jss-tg

README.md

@@ -20,7 +20,7 @@ mkdir /data
 git clone https://github.com/TranscodeGroup/docker.git /home/docker
 ```
 
-### 2. 配置`compse.yaml`
+### 2. 配置`compose.yaml`
 
 创建`/home/docker-compose/compose.yaml`文件, 参考如下示例:
 

default.en.env

@@ -1,10 +1,10 @@
 ## ================================ Directory ================================
 
+# Docker repository directory. For files inside the docker repository, relative paths are mostly used, so referencing this absolute path is generally not necessary.
+DOCKER_DIR=/home/docker
 # Data directory, used for storing logs/database/files, etc.
 DATA_DIR=/data
-# Docker repository directory. It is not recommended to reference the absolute path of the docker repository in the compose file. It is recommended to use configs instead: https://docs.docker.com/reference/compose-file/configs/
-DOCKER_DIR=/home/docker
-# Project configuration directory
+# Configuration directory, used for storing configuration files. It is recommended to use git to manage this directory.
 DOCKER_COMPOSE_DIR=/home/docker-compose
 # bus frontend file override directory. Files in this directory will be copied to the bus frontend directory when compose is up. Usually, the following files can be overridden:
 # - _app.config.js: Frontend configuration file
@@ -41,7 +41,7 @@ SERVER_HOSTNAME='' # livedvr.tripsdd.com
 # Required, absolute path of the certificate file, excluding .crt/.key suffix. nginx actually reads the two files ${SSL_CERTIFICATE}.crt and ${SSL_CERTIFICATE}.key
 # If using http, or using https but no certificate has been applied for temporarily, it can be set to the built-in fake certificate: /home/docker/nginx/ssl/placeholder
 # If using crotbot to automatically apply for a certificate, you need to start it separately first (docker compose up crotbot). The applied certificate path will be printed in the log, and then add it to the variable, generally: /data/certbot/live/${SERVER_HOSTNAME}/certificate,
-SSL_CERTIFICATE='/home/docker/nginx/ssl/placeholder'
+SSL_CERTIFICATE=${DOCKER_DIR}/nginx/ssl/placeholder # /home/docker/nginx/ssl/placeholder
 
 # When bus and track are deployed on the same server, they need to be distinguished by domain name
 BUS_HOSTNAME=${SERVER_HOSTNAME}

default.env

@@ -1,10 +1,10 @@
 ## ================================ 目录 ================================
 
+# docker仓库的目录, 在docker仓库内部的文件, 大部分时候使用相对路径就行了, 一般不需要引用这个绝对路径
+DOCKER_DIR=/home/docker
 # 数据目录, 用于存放日志/数据库/文件等
 DATA_DIR=/data
-# docker仓库的目录, 不建议在compose文件中引用docker仓库的绝对路径, 建议使用configs替代: https://docs.docker.com/reference/compose-file/configs/
-DOCKER_DIR=/home/docker
-# 实际配置项目配置目录
+# 配置目录, 用于存放配置文件, 建议使用git管理该目录
 DOCKER_COMPOSE_DIR=/home/docker-compose
 # bus前端文件复写目录, 该目录中的文件会在compose被up时被复制到bus前端目录, 通常可以复写如下文件:
 # - _app.config.js: 前端配置文件
@@ -41,7 +41,7 @@ SERVER_HOSTNAME='' # livedvr.tripsdd.com
 # 必填, 证书文件的绝对路径, 排除.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/nginx/ssl/placeholder'
+SSL_CERTIFICATE=${DOCKER_DIR}/nginx/ssl/placeholder # /home/docker/nginx/ssl/placeholder
 
 # bus和track部署在同一台服务器上时, 需要通过域名区分两者
 BUS_HOSTNAME=${SERVER_HOSTNAME}

video/compose.storage.yml

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

video/compose.yml

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