From b5394a9d51b89422985e4a56567b629adb883431 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 25 Nov 2025 09:03:47 +0800
Subject: [PATCH] fix: 修改配置,指定项目名称
---
.env | 3 ++-
webodm.sh | 15 +++++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/.env b/.env
index 365a3f4..a69c9ab 100644
--- a/.env
+++ b/.env
@@ -11,4 +11,5 @@
WO_DEV=NO
WO_BROKER=redis://broker
WO_DEFAULT_NODES=1
-WO_SETTINGS=
\ No newline at end of file
+WO_SETTINGS=
+WO_PROJECT_NAME=webodm
\ No newline at end of file
diff --git a/webodm.sh b/webodm.sh
index 10bf824..dbcbc86 100644
--- a/webodm.sh
+++ b/webodm.sh
@@ -38,6 +38,7 @@
DEFAULT_SSL_INSECURE_PORT_REDIRECT="$WO_SSL_INSECURE_PORT_REDIRECT"
DEFAULT_BROKER="$WO_BROKER"
DEFAULT_NODES="$WO_DEFAULT_NODES"
+DEFAULT_PROJECT_NAME="$WO_PROJECT_NAME"
# Parse args for overrides
POSITIONAL=()
@@ -148,6 +149,12 @@
shift # past argument
shift # past value
;;
+ --project-name) # 添加项目名称参数
+ export COMPOSE_PROJECT_NAME="$2"
+ shift # past argument
+ shift # past value
+ ;;
+ *)
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
shift # past argument
@@ -155,6 +162,12 @@
esac
done
set -- "${POSITIONAL[@]}" # restore positional parameter
+
+
+# 设置默认项目名称（如果没有通过参数或环境变量设置）
+if [[ -z "$COMPOSE_PROJECT_NAME" ]]; then
+ export COMPOSE_PROJECT_NAME="$DEFAULT_PROJECT_NAME"
+fi
usage(){
echo "Usage: $0 <command>"
@@ -192,6 +205,7 @@
echo " --settings Path to a settings.py file to enable modifications of system settings (default: None)"
echo " --worker-memory Maximum amount of memory allocated for the worker process (default: unlimited)"
echo " --worker-cpus Maximum number of CPUs allocated for the worker process (default: all)"
+ echo " --project-name Set the Docker Compose project name (default: $DEFAULT_PROJECT_NAME)"
exit
}
@@ -379,6 +393,7 @@
echo "Settings: $WO_SETTINGS"
echo "Worker memory limit: $WO_WORKER_MEMORY"
echo "Worker cpus limit: $WO_WORKER_CPUS"
+ echo "Project Name: $COMPOSE_PROJECT_NAME"
echo "================================"
echo "Make sure to issue a $0 down if you decide to change the environment."
echo ""
--
Gitblit v1.9.3