(refactor) Remove env files and scripts, update config files
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
additionalProperties:
|
||||
formFields:
|
||||
- default: "/home/dpanel"
|
||||
- default: "./data"
|
||||
edit: true
|
||||
envKey: DPANEL_ROOT_PATH
|
||||
labelZh: 数据持久化路径
|
||||
@@ -31,24 +31,3 @@ additionalProperties:
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "admin"
|
||||
edit: true
|
||||
envKey: INSTALL_USERNAME
|
||||
labelZh: 管理员 用户名
|
||||
labelEn: Admin Username
|
||||
required: true
|
||||
type: text
|
||||
- default: "admin"
|
||||
edit: true
|
||||
envKey: INSTALL_PASSWORD
|
||||
labelZh: 管理员 密码
|
||||
labelEn: Admin Password
|
||||
required: true
|
||||
type: text
|
||||
- default: ""
|
||||
edit: true
|
||||
envKey: HTTP_PROXY
|
||||
labelZh: 网络代理
|
||||
labelEn: Network Proxy
|
||||
required: false
|
||||
type: text
|
||||
|
||||
@@ -15,13 +15,9 @@ services:
|
||||
- ${PANEL_APP_PORT_ADMIN}:8080
|
||||
- ${PANEL_APP_PORT_HTTP}:80
|
||||
- ${PANEL_APP_PORT_HTTPS}:443
|
||||
env_file:
|
||||
- ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
|
||||
- ${ENV_FILE:-/etc/1panel/envs/default.env}
|
||||
volumes:
|
||||
- ${DPANEL_ROOT_PATH}/data:/dpanel
|
||||
- ${DPANEL_ROOT_PATH}/compose:/dpanel/compose
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
environment:
|
||||
- APP_NAME=${CONTAINER_NAME}
|
||||
- HTTPS_PROXY=${HTTP_PROXY}
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
# copyright© 2024 XinJiang Ms Studio
|
||||
ENV_FILE=.env
|
||||
@@ -1,2 +0,0 @@
|
||||
# copyright© 2024 XinJiang Ms Studio
|
||||
TZ=Asia/Shanghai
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -f .env ]; then
|
||||
source .env
|
||||
|
||||
# setup-1 add default values
|
||||
CURRENT_DIR=$(pwd)
|
||||
sed -i '/^ENV_FILE=/d' .env
|
||||
sed -i '/^GLOBAL_ENV_FILE=/d' .env
|
||||
echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
|
||||
echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
|
||||
|
||||
echo "Check Finish."
|
||||
|
||||
else
|
||||
echo "Error: .env file not found."
|
||||
fi
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -f .env ]; then
|
||||
source .env
|
||||
|
||||
echo "Check Finish."
|
||||
|
||||
else
|
||||
echo "Error: .env file not found."
|
||||
fi
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -f .env ]; then
|
||||
source .env
|
||||
|
||||
# setup-1 add default values
|
||||
CURRENT_DIR=$(pwd)
|
||||
sed -i '/^ENV_FILE=/d' .env
|
||||
sed -i '/^GLOBAL_ENV_FILE=/d' .env
|
||||
echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
|
||||
echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
|
||||
|
||||
echo "Check Finish."
|
||||
|
||||
else
|
||||
echo "Error: .env file not found."
|
||||
fi
|
||||
Reference in New Issue
Block a user