From 6839e6db6e15cd575280428055ee783ea7a0d9cf Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 02:24:31 -0400 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0DATA=5FDIR?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.default | 2 ++ bus/compose.yml | 16 ++++++++-------- jtt808/compose.yml | 4 ++-- maintain/compose.yml | 4 ++-- minio/compose.yml | 2 +- mongodb/compose.yml | 6 +++--- mysql5.7/compose.yml | 8 ++++---- mysql8/compose.yml | 8 ++++---- nginx/compose.bus.yml | 2 +- nginx/compose.yml | 4 ++-- rabbitmq/compose.yml | 2 +- redis/compose.yml | 2 +- video-nginx/compose.yml | 2 +- video/compose.storage.yaml | 6 +++--- video/compose.yml | 4 ++-- 15 files changed, 37 insertions(+), 35 deletions(-) diff --git a/.env.default b/.env.default index 4f220cc..6a01e2e 100644 --- a/.env.default +++ b/.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} diff --git a/bus/compose.yml b/bus/compose.yml index 54697d6..e567240 100644 --- a/bus/compose.yml +++ b/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 diff --git a/jtt808/compose.yml b/jtt808/compose.yml index dbfc5ea..4c01287 100644 --- a/jtt808/compose.yml +++ b/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 # 监听端口 diff --git a/maintain/compose.yml b/maintain/compose.yml index 8c745c9..99fa8b9 100644 --- a/maintain/compose.yml +++ b/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: diff --git a/minio/compose.yml b/minio/compose.yml index ca456a4..c04e764 100644 --- a/minio/compose.yml +++ b/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" diff --git a/mongodb/compose.yml b/mongodb/compose.yml index b44bdc0..bebe1e4 100644 --- a/mongodb/compose.yml +++ b/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} diff --git a/mysql5.7/compose.yml b/mysql5.7/compose.yml index e7b11e6..b84225b 100644 --- a/mysql5.7/compose.yml +++ b/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} diff --git a/mysql8/compose.yml b/mysql8/compose.yml index 0e43a29..13e061d 100644 --- a/mysql8/compose.yml +++ b/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} diff --git a/nginx/compose.bus.yml b/nginx/compose.bus.yml index 6fc4223..73d2596 100644 --- a/nginx/compose.bus.yml +++ b/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 diff --git a/nginx/compose.yml b/nginx/compose.yml index 15c3bb0..7d4ca18 100644 --- a/nginx/compose.yml +++ b/nginx/compose.yml @@ -11,8 +11,8 @@ services: - ssl-certificate - ssl-certificate-key volumes: - - "/data/nginx/html:/usr/share/nginx/html" - - "/data/logs/nginx:/var/log/nginx" + - "${DATA_DIR:-/data}/nginx/html:/usr/share/nginx/html" + - "${DATA_DIR:-/data}/logs/nginx:/var/log/nginx" configs: - source: nginx-nginx.conf target: /etc/nginx/nginx.conf diff --git a/rabbitmq/compose.yml b/rabbitmq/compose.yml index b3d8a60..6177cad 100644 --- a/rabbitmq/compose.yml +++ b/rabbitmq/compose.yml @@ -23,7 +23,7 @@ services: - RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD:?required} - RABBITMQ_DEFAULT_VHOST=/track volumes: - - "/data/rabbitmq:/var/lib/rabbitmq" + - "${DATA_DIR:-/data}/rabbitmq:/var/lib/rabbitmq" logging: driver: "json-file" options: diff --git a/redis/compose.yml b/redis/compose.yml index 348b430..0a60dff 100644 --- a/redis/compose.yml +++ b/redis/compose.yml @@ -6,7 +6,7 @@ services: # 启用持久化 增加密码 降低日志级别 限制数据库数量 command: --appendonly yes --requirepass ${REDIS_PASSWORD:?required} --loglevel warning --databases 3 volumes: - - /data/redis/data:/data + - ${DATA_DIR:-/data}/redis/data:/data ports: - ${REDIS_PORT:-6379}:6379 logging: diff --git a/video-nginx/compose.yml b/video-nginx/compose.yml index e32c7af..fb7f072 100644 --- a/video-nginx/compose.yml +++ b/video-nginx/compose.yml @@ -24,7 +24,7 @@ services: # https://hub.docker.com/_/nginx#:~:text=Using%20environment%20variables #- "/home/docker/video-nginx/conf/conf.d:/etc/nginx/templates" - "/home/docker/video-nginx/html:/usr/share/nginx/html" - - "/data/logs/video-nginx:/var/log/nginx" + - "${DATA_DIR:-/data}/logs/video-nginx:/var/log/nginx" configs: - source: nginx.conf target: /etc/nginx/nginx.conf diff --git a/video/compose.storage.yaml b/video/compose.storage.yaml index 3ce1d8a..50725e9 100644 --- a/video/compose.storage.yaml +++ b/video/compose.storage.yaml @@ -2,11 +2,11 @@ services: srs: volumes: - "/home/docker/video/srs-storage/conf:/usr/local/srs/conf" - - "/data/srs-storage/html:/usr/local/srs/objs/nginx/html" + - "${DATA_DIR:-/data}/srs-storage/html:/usr/local/srs/objs/nginx/html" rtp: volumes: - - "/data/logs/rtp-storage:/logs" - - "/data/srs-storage/html/dvr/live:/data/record" + - "${DATA_DIR:-/data}/logs/rtp-storage:/logs" + - "${DATA_DIR:-/data}/srs-storage/html/dvr/live:/data/record" depends_on: - minio environment: diff --git a/video/compose.yml b/video/compose.yml index f4c1277..df71de2 100644 --- a/video/compose.yml +++ b/video/compose.yml @@ -12,7 +12,7 @@ services: #- 8080:8080 volumes: - "/home/docker/video/srs/conf:/usr/local/srs/conf" - - "/data/srs/html:/usr/local/srs/objs/nginx/html" + - "${DATA_DIR:-/data}/srs/html:/usr/local/srs/objs/nginx/html" ulimits: nproc: 65535 nofile: @@ -40,7 +40,7 @@ services: # 客户端-对讲和api服务接口,建议nginx代理, 内部别名访问 # - 9006:9006 volumes: - - "/data/logs/rtp:/logs" + - "${DATA_DIR:-/data}/logs/rtp:/logs" environment: # 服务节点名称 - gateway_zone=live-${VIDEO_IP:?required} From 7cb0d1f008e1a727be3de5842cd408eee4a6acd9 Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 02:41:13 -0400 Subject: [PATCH 2/8] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=87=BAcompose=E9=85=8D=E7=BD=AE=E7=9A=84=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 21e5880..6111e20 100644 --- a/README.md +++ b/README.md @@ -60,3 +60,11 @@ unzip maintain.zip -d track ```sh docker compose up ``` + +### 6. 导出compose配置 + +将compose配置导出成一个文件, 方便对比差异: + +```sh +docker compose config > compose-stack.yaml +``` From 111398b99a03747bb3d278c60c355c485d13558b Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 02:42:36 -0400 Subject: [PATCH 3/8] =?UTF-8?q?wip:=20DATA=5FDIR=E5=9C=A8env.default?= =?UTF-8?q?=E4=B8=AD=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bus/compose.yml | 16 ++++++++-------- jtt808/compose.yml | 4 ++-- maintain/compose.yml | 4 ++-- minio/compose.yml | 2 +- mongodb/compose.yml | 6 +++--- mysql5.7/compose.yml | 8 ++++---- mysql8/compose.yml | 8 ++++---- nginx/compose.bus.yml | 2 +- nginx/compose.yml | 4 ++-- rabbitmq/compose.yml | 2 +- redis/compose.yml | 2 +- video-nginx/compose.yml | 2 +- video/compose.storage.yaml | 6 +++--- video/compose.yml | 4 ++-- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/bus/compose.yml b/bus/compose.yml index e567240..d74a38b 100644 --- a/bus/compose.yml +++ b/bus/compose.yml @@ -4,8 +4,8 @@ services: container_name: gateway_808_2019 restart: always volumes: - - ${DATA_DIR:-/data}/files:/data/files - - ${DATA_DIR:-/data}/logs/gateway_808_2019:/logs + - ${DATA_DIR}/files:/data/files + - ${DATA_DIR}/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_DIR:-/data}/files:/data/files + - ${DATA_DIR}/files:/data/files - /usr/share/fonts:/usr/share/fonts # ports: # 内部端口, 不暴露 @@ -108,7 +108,7 @@ services: container_name: gateway_dispatch restart: always volumes: - - ${DATA_DIR:-/data}/files:/data/files + - ${DATA_DIR}/files:/data/files # ports: # 内部端口, 不暴露 # - 8011:8011 @@ -158,8 +158,8 @@ services: ports: - ${JTT808_PORT_FILE}:${JTT808_PORT_FILE} volumes: - - "${DATA_DIR:-/data}/logs/jsatl12:/logs" - - "${DATA_DIR:-/data}/files/alarm:/data/files/alarm" + - "${DATA_DIR}/logs/jsatl12:/logs" + - "${DATA_DIR}/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_DIR:-/data}/logs/gateway_calculation:/logs - - ${DATA_DIR:-/data}/files:/data/files + - ${DATA_DIR}/logs/gateway_calculation:/logs + - ${DATA_DIR}/files:/data/files environment: # 默认开启分区存储 - DYNAMIC_TABLE=TRUE diff --git a/jtt808/compose.yml b/jtt808/compose.yml index 4c01287..087bbbc 100644 --- a/jtt808/compose.yml +++ b/jtt808/compose.yml @@ -12,8 +12,8 @@ services: - ${JTT808_PORT_FTP_PASSIVE}:${JTT808_PORT_FTP_PASSIVE} volumes: - "/etc/localtime:/etc/localtime:ro" - - "${DATA_DIR:-/data}/jtt808:/data/jtt808" - - "${DATA_DIR:-/data}/logs/jtt808:/logs" + - "${DATA_DIR}/jtt808:/data/jtt808" + - "${DATA_DIR}/logs/jtt808:/logs" environment: - JAVA_TOOL_OPTIONS=-Xms1024m -Xmx2048m # 监听端口 diff --git a/maintain/compose.yml b/maintain/compose.yml index 99fa8b9..c5008c4 100644 --- a/maintain/compose.yml +++ b/maintain/compose.yml @@ -6,8 +6,8 @@ services: volumes: - /etc/localtime:/etc/localtime - ${MAINTAIN_TOKEN_DIR:-/home/docker-compose/token}:/home/token - - ${DATA_DIR:-/data}/logs/maintain:/logs - - ${DATA_DIR:-/data}/fonts:/data/fonts + - ${DATA_DIR}/logs/maintain:/logs + - ${DATA_DIR}/fonts:/data/fonts ports: - ${MAINTAIN_PORT:-8080}:8080 environment: diff --git a/minio/compose.yml b/minio/compose.yml index c04e764..772e651 100644 --- a/minio/compose.yml +++ b/minio/compose.yml @@ -12,7 +12,7 @@ services: - MINIO_ROOT_PASSWORD=${MINIO_PASSWORD:?required} - MINIO_BROWSER_REDIRECT_URL=https://${VIDEO_HOSTNAME:?required} volumes: - - "${DATA_DIR:-/data}/minio-data:/data" + - "${DATA_DIR}/minio-data:/data" command: server /data --console-address ":${MINIO_PORT_HTTP:-8001}" --address ":${MINIO_PORT:-8000}" logging: driver: "json-file" diff --git a/mongodb/compose.yml b/mongodb/compose.yml index bebe1e4..a49899b 100644 --- a/mongodb/compose.yml +++ b/mongodb/compose.yml @@ -8,9 +8,9 @@ services: - ${MONGODB_PORT:-27017}:27017 volumes: - /etc/localtime:/etc/localtime - - ${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 + - ${DATA_DIR}/mongo/data/db:/data/db + - ${DATA_DIR}/mongo/data/log:/var/log/mongodb + - ${DATA_DIR}/mongo/data/config:/etc/mongo environment: - MONGO_INITDB_ROOT_USERNAME=root - MONGO_INITDB_ROOT_PASSWORD=${MONGODB_PASSWORD:?required} diff --git a/mysql5.7/compose.yml b/mysql5.7/compose.yml index b84225b..4fa14e0 100644 --- a/mysql5.7/compose.yml +++ b/mysql5.7/compose.yml @@ -6,10 +6,10 @@ services: ports: - ${MYSQL_PORT:-3306}:3306 volumes: - - ${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 + - ${DATA_DIR}/mysql5.7/data:/var/lib/mysql + - ${DATA_DIR}/mysql5.7/logs:/var/log/mysql + - ${DATA_DIR}/mysql5.7/backup/database:/mysql/backup/database + - ${DATA_DIR}/mysql5.7/backup/log:/mysql/backup/log environment: # 设置密码 - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD:?required} diff --git a/mysql8/compose.yml b/mysql8/compose.yml index 13e061d..01217c5 100644 --- a/mysql8/compose.yml +++ b/mysql8/compose.yml @@ -13,10 +13,10 @@ services: - source: mysql8.initdb target: /docker-entrypoint-initdb.d volumes: - - "${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" + - "${DATA_DIR}/mysql8/data:/var/lib/mysql" + - "${DATA_DIR}/mysql8/logs:/var/log/mysql" + - "${DATA_DIR}/mysql8/backup/database:/mysql/backup/database" + - "${DATA_DIR}/mysql8/backup/log:/mysql/backup/log" environment: # 设置密码 - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD:?required} diff --git a/nginx/compose.bus.yml b/nginx/compose.bus.yml index 73d2596..2a3bcb1 100644 --- a/nginx/compose.bus.yml +++ b/nginx/compose.bus.yml @@ -9,7 +9,7 @@ services: environment: - BUS_HOSTNAME=${BUS_HOSTNAME:?required} volumes: - - "${DATA_DIR:-/data}/files:/data/files" + - "${DATA_DIR}/files:/data/files" secrets: bus-ssl-certificate: file: ${BUS_SSL_CERTIFICATE:?required}.crt diff --git a/nginx/compose.yml b/nginx/compose.yml index 7d4ca18..fec8b74 100644 --- a/nginx/compose.yml +++ b/nginx/compose.yml @@ -11,8 +11,8 @@ services: - ssl-certificate - ssl-certificate-key volumes: - - "${DATA_DIR:-/data}/nginx/html:/usr/share/nginx/html" - - "${DATA_DIR:-/data}/logs/nginx:/var/log/nginx" + - "${DATA_DIR}/nginx/html:/usr/share/nginx/html" + - "${DATA_DIR}/logs/nginx:/var/log/nginx" configs: - source: nginx-nginx.conf target: /etc/nginx/nginx.conf diff --git a/rabbitmq/compose.yml b/rabbitmq/compose.yml index 6177cad..d2ce16e 100644 --- a/rabbitmq/compose.yml +++ b/rabbitmq/compose.yml @@ -23,7 +23,7 @@ services: - RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD:?required} - RABBITMQ_DEFAULT_VHOST=/track volumes: - - "${DATA_DIR:-/data}/rabbitmq:/var/lib/rabbitmq" + - "${DATA_DIR}/rabbitmq:/var/lib/rabbitmq" logging: driver: "json-file" options: diff --git a/redis/compose.yml b/redis/compose.yml index 0a60dff..a8ae2b5 100644 --- a/redis/compose.yml +++ b/redis/compose.yml @@ -6,7 +6,7 @@ services: # 启用持久化 增加密码 降低日志级别 限制数据库数量 command: --appendonly yes --requirepass ${REDIS_PASSWORD:?required} --loglevel warning --databases 3 volumes: - - ${DATA_DIR:-/data}/redis/data:/data + - ${DATA_DIR}/redis/data:/data ports: - ${REDIS_PORT:-6379}:6379 logging: diff --git a/video-nginx/compose.yml b/video-nginx/compose.yml index fb7f072..8b70494 100644 --- a/video-nginx/compose.yml +++ b/video-nginx/compose.yml @@ -24,7 +24,7 @@ services: # https://hub.docker.com/_/nginx#:~:text=Using%20environment%20variables #- "/home/docker/video-nginx/conf/conf.d:/etc/nginx/templates" - "/home/docker/video-nginx/html:/usr/share/nginx/html" - - "${DATA_DIR:-/data}/logs/video-nginx:/var/log/nginx" + - "${DATA_DIR}/logs/video-nginx:/var/log/nginx" configs: - source: nginx.conf target: /etc/nginx/nginx.conf diff --git a/video/compose.storage.yaml b/video/compose.storage.yaml index 50725e9..984fc97 100644 --- a/video/compose.storage.yaml +++ b/video/compose.storage.yaml @@ -2,11 +2,11 @@ services: srs: volumes: - "/home/docker/video/srs-storage/conf:/usr/local/srs/conf" - - "${DATA_DIR:-/data}/srs-storage/html:/usr/local/srs/objs/nginx/html" + - "${DATA_DIR}/srs-storage/html:/usr/local/srs/objs/nginx/html" rtp: volumes: - - "${DATA_DIR:-/data}/logs/rtp-storage:/logs" - - "${DATA_DIR:-/data}/srs-storage/html/dvr/live:/data/record" + - "${DATA_DIR}/logs/rtp-storage:/logs" + - "${DATA_DIR}/srs-storage/html/dvr/live:/data/record" depends_on: - minio environment: diff --git a/video/compose.yml b/video/compose.yml index df71de2..1ad7e47 100644 --- a/video/compose.yml +++ b/video/compose.yml @@ -12,7 +12,7 @@ services: #- 8080:8080 volumes: - "/home/docker/video/srs/conf:/usr/local/srs/conf" - - "${DATA_DIR:-/data}/srs/html:/usr/local/srs/objs/nginx/html" + - "${DATA_DIR}/srs/html:/usr/local/srs/objs/nginx/html" ulimits: nproc: 65535 nofile: @@ -40,7 +40,7 @@ services: # 客户端-对讲和api服务接口,建议nginx代理, 内部别名访问 # - 9006:9006 volumes: - - "${DATA_DIR:-/data}/logs/rtp:/logs" + - "${DATA_DIR}/logs/rtp:/logs" environment: # 服务节点名称 - gateway_zone=live-${VIDEO_IP:?required} From 000914139cc707fb466bb13818506de252e042df Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 02:51:22 -0400 Subject: [PATCH 4/8] wip: xx --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6111e20..f2873da 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ docker compose up ### 6. 导出compose配置 -将compose配置导出成一个文件, 方便对比差异: +执行如下命令, 将compose配置导出成一个文件, 方便在更新compose文件后对比差异: ```sh docker compose config > compose-stack.yaml From b0c385ae6a521ab3dfe14e384e16bb69342981ef Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 03:41:46 -0400 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20typo=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/README.md | 8 ++++---- projects/distar/_app.config.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/README.md b/projects/README.md index a756fd5..93a8d52 100644 --- a/projects/README.md +++ b/projects/README.md @@ -4,14 +4,14 @@ ```sh # 确认https://github.com/TranscodeGroup/maintain-vben-admin仓库存在对应的版本tag -# 确认 https://xn.transcodegroup.cn:8590/buildConfiguration/MaintainVbenAdmin_Release?mode=builds 已经打包出附件 +# 确认 http://th-ci.transcodegroup.cn:9080/buildConfiguration/MaintainVbenAdmin_Release 已经打包出附件 # 下载tag版本到默认目录, 并解压到版本对应的文件夹 -/home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1 +/home/docker/projects/distar-beta-deploy.sh --tag=v1.15.1 # 下载tag版本到当前目录 -/home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1 --dir=. +/home/docker/projects/distar-beta-deploy.sh --tag=v1.15.1 --dir=. # 下载tag版本到/data/nginx/html目录 -/home/docker/projects/distar-beta-depoly.sh --tag=v1.15.1 --dir=/data/nginx/html +/home/docker/projects/distar-beta-deploy.sh --tag=v1.15.1 --dir=/data/nginx/html ``` diff --git a/projects/distar/_app.config.js b/projects/distar/_app.config.js index eab7b5a..4c1625d 100644 --- a/projects/distar/_app.config.js +++ b/projects/distar/_app.config.js @@ -1,7 +1,7 @@ window.__PRODUCTION__APP__CONF__ = { VITE_GLOB_APP_TITLE: 'Distar GPS', VITE_GLOB_APP_SHORT_NAME: 'tracker-distar', - VITE_GLOB_API_URL: 'http://58.82.168.197:9080', + VITE_GLOB_API_URL: '', VITE_GLOB_API_URL_PREFIX: '/api', VITE_GLOB_UPLOAD_URL: '/upload', } From bc1f92fd71580b42a266d949c39561d23ebd633f Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 04:08:53 -0400 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E9=98=B2=E6=AD=A2redis=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=8C=85=E5=90=AB=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=97=B6=E9=94=99=E8=AF=AF=E7=9A=84=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- redis/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redis/compose.yml b/redis/compose.yml index a8ae2b5..04de489 100644 --- a/redis/compose.yml +++ b/redis/compose.yml @@ -4,7 +4,7 @@ services: container_name: redis restart: always # 启用持久化 增加密码 降低日志级别 限制数据库数量 - command: --appendonly yes --requirepass ${REDIS_PASSWORD:?required} --loglevel warning --databases 3 + command: --appendonly yes --requirepass "${REDIS_PASSWORD:?required}" --loglevel warning --databases 3 volumes: - ${DATA_DIR}/redis/data:/data ports: From d4e777b4e3c2d1ca9a116527d23837ea820760c4 Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 04:09:11 -0400 Subject: [PATCH 7/8] =?UTF-8?q?Revert=20"wip:=20DATA=5FDIR=E5=9C=A8env.def?= =?UTF-8?q?ault=E4=B8=AD=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 111398b99a03747bb3d278c60c355c485d13558b. --- bus/compose.yml | 16 ++++++++-------- jtt808/compose.yml | 4 ++-- maintain/compose.yml | 4 ++-- minio/compose.yml | 2 +- mongodb/compose.yml | 6 +++--- mysql5.7/compose.yml | 8 ++++---- mysql8/compose.yml | 8 ++++---- nginx/compose.bus.yml | 2 +- nginx/compose.yml | 4 ++-- rabbitmq/compose.yml | 2 +- redis/compose.yml | 2 +- video-nginx/compose.yml | 2 +- video/compose.storage.yaml | 6 +++--- video/compose.yml | 4 ++-- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/bus/compose.yml b/bus/compose.yml index d74a38b..e567240 100644 --- a/bus/compose.yml +++ b/bus/compose.yml @@ -4,8 +4,8 @@ services: container_name: gateway_808_2019 restart: always volumes: - - ${DATA_DIR}/files:/data/files - - ${DATA_DIR}/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_DIR}/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_DIR}/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_DIR}/logs/jsatl12:/logs" - - "${DATA_DIR}/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_DIR}/logs/gateway_calculation:/logs - - ${DATA_DIR}/files:/data/files + - ${DATA_DIR:-/data}/logs/gateway_calculation:/logs + - ${DATA_DIR:-/data}/files:/data/files environment: # 默认开启分区存储 - DYNAMIC_TABLE=TRUE diff --git a/jtt808/compose.yml b/jtt808/compose.yml index 087bbbc..4c01287 100644 --- a/jtt808/compose.yml +++ b/jtt808/compose.yml @@ -12,8 +12,8 @@ services: - ${JTT808_PORT_FTP_PASSIVE}:${JTT808_PORT_FTP_PASSIVE} volumes: - "/etc/localtime:/etc/localtime:ro" - - "${DATA_DIR}/jtt808:/data/jtt808" - - "${DATA_DIR}/logs/jtt808:/logs" + - "${DATA_DIR:-/data}/jtt808:/data/jtt808" + - "${DATA_DIR:-/data}/logs/jtt808:/logs" environment: - JAVA_TOOL_OPTIONS=-Xms1024m -Xmx2048m # 监听端口 diff --git a/maintain/compose.yml b/maintain/compose.yml index c5008c4..99fa8b9 100644 --- a/maintain/compose.yml +++ b/maintain/compose.yml @@ -6,8 +6,8 @@ services: volumes: - /etc/localtime:/etc/localtime - ${MAINTAIN_TOKEN_DIR:-/home/docker-compose/token}:/home/token - - ${DATA_DIR}/logs/maintain:/logs - - ${DATA_DIR}/fonts:/data/fonts + - ${DATA_DIR:-/data}/logs/maintain:/logs + - ${DATA_DIR:-/data}/fonts:/data/fonts ports: - ${MAINTAIN_PORT:-8080}:8080 environment: diff --git a/minio/compose.yml b/minio/compose.yml index 772e651..c04e764 100644 --- a/minio/compose.yml +++ b/minio/compose.yml @@ -12,7 +12,7 @@ services: - MINIO_ROOT_PASSWORD=${MINIO_PASSWORD:?required} - MINIO_BROWSER_REDIRECT_URL=https://${VIDEO_HOSTNAME:?required} volumes: - - "${DATA_DIR}/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" diff --git a/mongodb/compose.yml b/mongodb/compose.yml index a49899b..bebe1e4 100644 --- a/mongodb/compose.yml +++ b/mongodb/compose.yml @@ -8,9 +8,9 @@ services: - ${MONGODB_PORT:-27017}:27017 volumes: - /etc/localtime:/etc/localtime - - ${DATA_DIR}/mongo/data/db:/data/db - - ${DATA_DIR}/mongo/data/log:/var/log/mongodb - - ${DATA_DIR}/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} diff --git a/mysql5.7/compose.yml b/mysql5.7/compose.yml index 4fa14e0..b84225b 100644 --- a/mysql5.7/compose.yml +++ b/mysql5.7/compose.yml @@ -6,10 +6,10 @@ services: ports: - ${MYSQL_PORT:-3306}:3306 volumes: - - ${DATA_DIR}/mysql5.7/data:/var/lib/mysql - - ${DATA_DIR}/mysql5.7/logs:/var/log/mysql - - ${DATA_DIR}/mysql5.7/backup/database:/mysql/backup/database - - ${DATA_DIR}/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} diff --git a/mysql8/compose.yml b/mysql8/compose.yml index 01217c5..13e061d 100644 --- a/mysql8/compose.yml +++ b/mysql8/compose.yml @@ -13,10 +13,10 @@ services: - source: mysql8.initdb target: /docker-entrypoint-initdb.d volumes: - - "${DATA_DIR}/mysql8/data:/var/lib/mysql" - - "${DATA_DIR}/mysql8/logs:/var/log/mysql" - - "${DATA_DIR}/mysql8/backup/database:/mysql/backup/database" - - "${DATA_DIR}/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} diff --git a/nginx/compose.bus.yml b/nginx/compose.bus.yml index 2a3bcb1..73d2596 100644 --- a/nginx/compose.bus.yml +++ b/nginx/compose.bus.yml @@ -9,7 +9,7 @@ services: environment: - BUS_HOSTNAME=${BUS_HOSTNAME:?required} volumes: - - "${DATA_DIR}/files:/data/files" + - "${DATA_DIR:-/data}/files:/data/files" secrets: bus-ssl-certificate: file: ${BUS_SSL_CERTIFICATE:?required}.crt diff --git a/nginx/compose.yml b/nginx/compose.yml index fec8b74..7d4ca18 100644 --- a/nginx/compose.yml +++ b/nginx/compose.yml @@ -11,8 +11,8 @@ services: - ssl-certificate - ssl-certificate-key volumes: - - "${DATA_DIR}/nginx/html:/usr/share/nginx/html" - - "${DATA_DIR}/logs/nginx:/var/log/nginx" + - "${DATA_DIR:-/data}/nginx/html:/usr/share/nginx/html" + - "${DATA_DIR:-/data}/logs/nginx:/var/log/nginx" configs: - source: nginx-nginx.conf target: /etc/nginx/nginx.conf diff --git a/rabbitmq/compose.yml b/rabbitmq/compose.yml index d2ce16e..6177cad 100644 --- a/rabbitmq/compose.yml +++ b/rabbitmq/compose.yml @@ -23,7 +23,7 @@ services: - RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD:?required} - RABBITMQ_DEFAULT_VHOST=/track volumes: - - "${DATA_DIR}/rabbitmq:/var/lib/rabbitmq" + - "${DATA_DIR:-/data}/rabbitmq:/var/lib/rabbitmq" logging: driver: "json-file" options: diff --git a/redis/compose.yml b/redis/compose.yml index 04de489..51c40c7 100644 --- a/redis/compose.yml +++ b/redis/compose.yml @@ -6,7 +6,7 @@ services: # 启用持久化 增加密码 降低日志级别 限制数据库数量 command: --appendonly yes --requirepass "${REDIS_PASSWORD:?required}" --loglevel warning --databases 3 volumes: - - ${DATA_DIR}/redis/data:/data + - ${DATA_DIR:-/data}/redis/data:/data ports: - ${REDIS_PORT:-6379}:6379 logging: diff --git a/video-nginx/compose.yml b/video-nginx/compose.yml index 8b70494..fb7f072 100644 --- a/video-nginx/compose.yml +++ b/video-nginx/compose.yml @@ -24,7 +24,7 @@ services: # https://hub.docker.com/_/nginx#:~:text=Using%20environment%20variables #- "/home/docker/video-nginx/conf/conf.d:/etc/nginx/templates" - "/home/docker/video-nginx/html:/usr/share/nginx/html" - - "${DATA_DIR}/logs/video-nginx:/var/log/nginx" + - "${DATA_DIR:-/data}/logs/video-nginx:/var/log/nginx" configs: - source: nginx.conf target: /etc/nginx/nginx.conf diff --git a/video/compose.storage.yaml b/video/compose.storage.yaml index 984fc97..50725e9 100644 --- a/video/compose.storage.yaml +++ b/video/compose.storage.yaml @@ -2,11 +2,11 @@ services: srs: volumes: - "/home/docker/video/srs-storage/conf:/usr/local/srs/conf" - - "${DATA_DIR}/srs-storage/html:/usr/local/srs/objs/nginx/html" + - "${DATA_DIR:-/data}/srs-storage/html:/usr/local/srs/objs/nginx/html" rtp: volumes: - - "${DATA_DIR}/logs/rtp-storage:/logs" - - "${DATA_DIR}/srs-storage/html/dvr/live:/data/record" + - "${DATA_DIR:-/data}/logs/rtp-storage:/logs" + - "${DATA_DIR:-/data}/srs-storage/html/dvr/live:/data/record" depends_on: - minio environment: diff --git a/video/compose.yml b/video/compose.yml index 1ad7e47..df71de2 100644 --- a/video/compose.yml +++ b/video/compose.yml @@ -12,7 +12,7 @@ services: #- 8080:8080 volumes: - "/home/docker/video/srs/conf:/usr/local/srs/conf" - - "${DATA_DIR}/srs/html:/usr/local/srs/objs/nginx/html" + - "${DATA_DIR:-/data}/srs/html:/usr/local/srs/objs/nginx/html" ulimits: nproc: 65535 nofile: @@ -40,7 +40,7 @@ services: # 客户端-对讲和api服务接口,建议nginx代理, 内部别名访问 # - 9006:9006 volumes: - - "${DATA_DIR}/logs/rtp:/logs" + - "${DATA_DIR:-/data}/logs/rtp:/logs" environment: # 服务节点名称 - gateway_zone=live-${VIDEO_IP:?required} From e0d5771186e28cb05c1d03852cc08ee601423bc8 Mon Sep 17 00:00:00 2001 From: cli Date: Wed, 15 Oct 2025 04:23:36 -0400 Subject: [PATCH 8/8] =?UTF-8?q?wip:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f2873da..63e1a51 100644 --- a/README.md +++ b/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等项目的前端: @@ -60,11 +66,3 @@ unzip maintain.zip -d track ```sh docker compose up ``` - -### 6. 导出compose配置 - -执行如下命令, 将compose配置导出成一个文件, 方便在更新compose文件后对比差异: - -```sh -docker compose config > compose-stack.yaml -```