fix: redis密码包含&时被错误截断的问题 等 (#19)

* feat: 添加DATA_DIR环境变量

* docs: 添加导出compose配置的说明

* wip: DATA_DIR在env.default中设置默认值

* wip: xx

* fix: typo等

* fix: 防止redis密码包含特殊字符时错误的解析

* Revert "wip: DATA_DIR在env.default中设置默认值"

This reverts commit 111398b.

* wip: 更新文档

---------

Co-authored-by: cli <cli@debian>

Author: jss-tg

.env.default

@@ -6,6 +6,8 @@ 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}

README.md

@@ -24,12 +24,18 @@ git clone https://github.com/TranscodeGroup/docker.git /home/docker
 
 创建`/home/docker-compose/.env`文件, 参考[.env.default](./.env.default)复写需要改写的配置项.
 
-在`/home/docker-compose`中执行如下命令, 验证所有使用到的必填的值, 是否已经设置:
+在`/home/docker-compose`中执行如下命令, 校验所有使用到的必填的值, 是否已经设置:
 
 ```sh
 docker compose config
 ```
 
+校验通过之后, 执行如下命令, 将compose配置导出成一个文件, 方便在更新compose文件后对比差异:
+
+```sh
+docker compose config > compose-stack.yaml
+```
+
 ### 4. 下载前端文件
 
 部署distar等项目的前端:  

bus/compose.yml

@@ -4,8 +4,8 @@ services:
     container_name: gateway_808_2019
     restart: always
     volumes:
-      - /data/files:/data/files
-      - /data/logs/gateway_808_2019:/logs
+      - ${DATA_DIR:-/data}/files:/data/files
+      - ${DATA_DIR:-/data}/logs/gateway_808_2019:/logs
     environment:
       - gateway_ip=${JTT808_IP}
       - gateway_port=${JTT808_PORT}
@@ -57,7 +57,7 @@ services:
     container_name: gateway_web
     restart: always
     volumes:
-      - /data/files:/data/files
+      - ${DATA_DIR:-/data}/files:/data/files
       - /usr/share/fonts:/usr/share/fonts
     # ports:
       # 内部端口, 不暴露
@@ -108,7 +108,7 @@ services:
     container_name: gateway_dispatch
     restart: always
     volumes:
-      - /data/files:/data/files
+      - ${DATA_DIR:-/data}/files:/data/files
     # ports:
       # 内部端口, 不暴露
       # - 8011:8011
@@ -158,8 +158,8 @@ services:
     ports:
       - ${JTT808_PORT_FILE}:${JTT808_PORT_FILE}
     volumes:
-      - "/data/logs/jsatl12:/logs"
-      - "/data/files/alarm:/data/files/alarm"
+      - "${DATA_DIR:-/data}/logs/jsatl12:/logs"
+      - "${DATA_DIR:-/data}/files/alarm:/data/files/alarm"
     environment:
       - gateway_expire_days=16
       - gateway_port=${JTT808_PORT_FILE}
@@ -182,8 +182,8 @@ services:
     container_name: gateway_calculation
     restart: always
     volumes:
-      - /data/logs/gateway_calculation:/logs
-      - /data/files:/data/files
+      - ${DATA_DIR:-/data}/logs/gateway_calculation:/logs
+      - ${DATA_DIR:-/data}/files:/data/files
     environment:
       # 默认开启分区存储
       - DYNAMIC_TABLE=TRUE

jtt808/compose.yml

@@ -12,8 +12,8 @@ services:
       - ${JTT808_PORT_FTP_PASSIVE}:${JTT808_PORT_FTP_PASSIVE}
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
-      - "/data/jtt808:/data/jtt808"
-      - "/data/logs/jtt808:/logs"
+      - "${DATA_DIR:-/data}/jtt808:/data/jtt808"
+      - "${DATA_DIR:-/data}/logs/jtt808:/logs"
     environment:
       - JAVA_TOOL_OPTIONS=-Xms1024m -Xmx2048m
       # 监听端口

maintain/compose.yml

@@ -6,8 +6,8 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime
       - ${MAINTAIN_TOKEN_DIR:-/home/docker-compose/token}:/home/token
-      - /data/logs/maintain:/logs
-      - /data/fonts:/data/fonts
+      - ${DATA_DIR:-/data}/logs/maintain:/logs
+      - ${DATA_DIR:-/data}/fonts:/data/fonts
     ports:
       - ${MAINTAIN_PORT:-8080}:8080
     environment:

minio/compose.yml

@@ -12,7 +12,7 @@ services:
       - MINIO_ROOT_PASSWORD=${MINIO_PASSWORD:?required}
       - MINIO_BROWSER_REDIRECT_URL=https://${VIDEO_HOSTNAME:?required}
     volumes:
-      - "/data/minio-data:/data"
+      - "${DATA_DIR:-/data}/minio-data:/data"
     command: server /data --console-address ":${MINIO_PORT_HTTP:-8001}" --address ":${MINIO_PORT:-8000}"
     logging: 
       driver: "json-file"

mongodb/compose.yml

@@ -8,9 +8,9 @@ services:
       - ${MONGODB_PORT:-27017}:27017
     volumes:
      - /etc/localtime:/etc/localtime
-     - /data/mongo/data/db:/data/db
-     - /data/mongo/data/log:/var/log/mongodb
-     - /data/mongo/data/config:/etc/mongo
+     - ${DATA_DIR:-/data}/mongo/data/db:/data/db
+     - ${DATA_DIR:-/data}/mongo/data/log:/var/log/mongodb
+     - ${DATA_DIR:-/data}/mongo/data/config:/etc/mongo
     environment:
     - MONGO_INITDB_ROOT_USERNAME=root
     - MONGO_INITDB_ROOT_PASSWORD=${MONGODB_PASSWORD:?required}

mysql5.7/compose.yml

@@ -6,10 +6,10 @@ services:
     ports:
       - ${MYSQL_PORT:-3306}:3306
     volumes:
-      - /data/mysql5.7/data:/var/lib/mysql
-      - /data/mysql5.7/logs:/var/log/mysql
-      - /data/mysql5.7/backup/database:/mysql/backup/database
-      - /data/mysql5.7/backup/log:/mysql/backup/log
+      - ${DATA_DIR:-/data}/mysql5.7/data:/var/lib/mysql
+      - ${DATA_DIR:-/data}/mysql5.7/logs:/var/log/mysql
+      - ${DATA_DIR:-/data}/mysql5.7/backup/database:/mysql/backup/database
+      - ${DATA_DIR:-/data}/mysql5.7/backup/log:/mysql/backup/log
     environment:
       # 设置密码
       - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD:?required}

mysql8/compose.yml

@@ -13,10 +13,10 @@ services:
       - source: mysql8.initdb
         target: /docker-entrypoint-initdb.d
     volumes:
-      - "/data/mysql8/data:/var/lib/mysql"
-      - "/data/mysql8/logs:/var/log/mysql"
-      - "/data/mysql8/backup/database:/mysql/backup/database"
-      - "/data/mysql8/backup/log:/mysql/backup/log"
+      - "${DATA_DIR:-/data}/mysql8/data:/var/lib/mysql"
+      - "${DATA_DIR:-/data}/mysql8/logs:/var/log/mysql"
+      - "${DATA_DIR:-/data}/mysql8/backup/database:/mysql/backup/database"
+      - "${DATA_DIR:-/data}/mysql8/backup/log:/mysql/backup/log"
     environment:
       # 设置密码
       - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD:?required}

nginx/compose.bus.yml

@@ -9,7 +9,7 @@ services:
     environment:
       - BUS_HOSTNAME=${BUS_HOSTNAME:?required}
     volumes:
-      - "/data/files:/data/files"
+      - "${DATA_DIR:-/data}/files:/data/files"
 secrets:
   bus-ssl-certificate:
     file: ${BUS_SSL_CERTIFICATE:?required}.crt