1
0

(refactor) Remove env files and scripts, update config files

This commit is contained in:
pooneyy
2025-09-04 00:36:13 +08:00
parent 0906288534
commit 89fbe837f1
1566 changed files with 1159 additions and 15329 deletions

View File

@@ -1,2 +0,0 @@
# copyright© 2024 XinJiang Ms Studio
ENV_FILE=.env

View File

@@ -1,2 +0,0 @@
# copyright© 2024 XinJiang Ms Studio
TZ=Asia/Shanghai

View File

@@ -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

View File

@@ -1,10 +0,0 @@
#!/bin/bash
if [ -f .env ]; then
source .env
echo "Check Finish."
else
echo "Error: .env file not found."
fi

View File

@@ -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

View File

@@ -19,7 +19,7 @@ additionalProperties:
value: mariadb
- label: Percona
value: percona
- default: "/home/kimai2"
- default: "./data"
edit: true
envKey: KIMAI2_ROOT_PATH
labelZh: 数据持久化路径

View File

@@ -4,7 +4,7 @@ networks:
services:
kimai2:
image: kimai/kimai2:apache-2.23.0
image: kimai/kimai2:apache-2.38.0
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"
@@ -13,11 +13,10 @@ services:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:8001
env_file:
- ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
- ${ENV_FILE:-/etc/1panel/envs/default.env}
volumes:
- ${KIMAI2_ROOT_PATH}/data:/opt/kimai/var/data
- ${KIMAI2_ROOT_PATH}/plugins:/opt/kimai/var/plugins
environment:
- DATABASE_URL=mysql://${DB_USER}:${DB_USER_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_NAME}?charset=utf8mb4
- ADMINMAIL=${ADMINMAIL}
- ADMINPASS=${ADMINPASS}