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

@@ -28,7 +28,7 @@ additionalProperties:
values:
- label: Redis
value: redis
- default: "/home/mediacms"
- default: "./data"
edit: true
envKey: MEDIACMS_ROOT_PATH
labelZh: 数据持久化路径

View File

@@ -4,15 +4,10 @@ networks:
services:
mediacms-migrations:
image: qyg2297248353/mediacms:v4.1.0
image: mediacms/mediacms:6.4.0
container_name: migrations-${CONTAINER_NAME}
env_file:
- ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
- ${ENV_FILE:-/etc/1panel/envs/default.env}
volumes:
- ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls
- ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original
- ${MEDIACMS_ROOT_PATH}/media_files/uploads:/home/mediacms.io/mediacms/media_files/uploads
- ${MEDIACMS_ROOT_PATH}:/home/mediacms.io/mediacms
command:
- ./deploy/docker/prestart.sh
restart: on-failure
@@ -26,7 +21,7 @@ services:
- ADMIN_EMAIL=${ADMIN_EMAIL}
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
mediacms:
image: qyg2297248353/mediacms:v4.1.0
image: mediacms/mediacms:6.4.0
container_name: ${CONTAINER_NAME}
depends_on:
- mediacms-migrations
@@ -36,13 +31,8 @@ services:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:80
env_file:
- ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
- ${ENV_FILE:-/etc/1panel/envs/default.env}
volumes:
- ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls
- ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original
- ${MEDIACMS_ROOT_PATH}/media_files/uploads:/home/mediacms.io/mediacms/media_files/uploads
- ${MEDIACMS_ROOT_PATH}:/home/mediacms.io/mediacms
restart: always
environment:
- ENABLE_CELERY_BEAT=no
@@ -50,12 +40,10 @@ services:
- ENABLE_CELERY_LONG=no
- ENABLE_MIGRATIONS=no
mediacms-celery-beat:
image: qyg2297248353/mediacms:v4.1.0
image: mediacms/mediacms:6.4.0
container_name: celery-beat-${CONTAINER_NAME}
volumes:
- ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls
- ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original
- ${MEDIACMS_ROOT_PATH}/media_files/uploads:/home/mediacms.io/mediacms/media_files/uploads
- ${MEDIACMS_ROOT_PATH}:/home/mediacms.io/mediacms
environment:
- ENABLE_UWSGI=no
- ENABLE_NGINX=no
@@ -63,14 +51,12 @@ services:
- ENABLE_CELERY_LONG=no
- ENABLE_MIGRATIONS=no
mediacms-celery-worker:
image: qyg2297248353/mediacms:v4.1.0
image: mediacms/mediacms:6.4.0
container_name: celery-worker-${CONTAINER_NAME}
depends_on:
- mediacms-migrations
volumes:
- ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls
- ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original
- ${MEDIACMS_ROOT_PATH}/media_files/uploads:/home/mediacms.io/mediacms/media_files/uploads
- ${MEDIACMS_ROOT_PATH}:/home/mediacms.io/mediacms
environment:
- ENABLE_UWSGI=no
- ENABLE_NGINX=no

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