(refactor) Remove env files and scripts, update config files
This commit is contained in:
@@ -1,22 +1,6 @@
|
||||
additionalProperties:
|
||||
formFields:
|
||||
- default: "1panel-network"
|
||||
edit: true
|
||||
envKey: NETWORK_MODE
|
||||
labelEn: Drive path
|
||||
labelZh: 网络模式
|
||||
required: true
|
||||
type: select
|
||||
values:
|
||||
- label: 主机网络模式
|
||||
value: "host"
|
||||
- label: 桥接网络模式
|
||||
value: "bridge"
|
||||
- label: 无网络模式
|
||||
value: "none"
|
||||
- label: 1panel-network
|
||||
value: "1panel-network"
|
||||
- default: "/home/openresty-manager"
|
||||
- default: "./data"
|
||||
edit: true
|
||||
envKey: OPENRESTY_MANAGER_ROOT_PATH
|
||||
labelZh: 数据持久化路径
|
||||
|
||||
@@ -9,14 +9,12 @@ services:
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
restart: always
|
||||
network_mode: ${NETWORK_MODE}
|
||||
networks:
|
||||
- 1panel-network
|
||||
ports:
|
||||
- ${PANEL_APP_PORT_HTTP}:34567
|
||||
- ${PANEL_APP_PORT_NGINX_HTTP}:80
|
||||
- ${PANEL_APP_PORT_NGINX_HTTPS}:443
|
||||
env_file:
|
||||
- ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
|
||||
- ${ENV_FILE:-/etc/1panel/envs/default.env}
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- /etc/resolv.conf:/etc/resolv.conf:ro
|
||||
|
||||
@@ -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