diff --git a/apps/acg-faka/1.3.9/data.yml b/apps/acg-faka/1.3.9/data.yml index efdeb2f90..f68df593e 100644 --- a/apps/acg-faka/1.3.9/data.yml +++ b/apps/acg-faka/1.3.9/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/acg-faka" + - default: "./data" edit: true envKey: ACG_FAKA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/acg-faka/1.3.9/docker-compose.yml b/apps/acg-faka/1.3.9/docker-compose.yml index fb83743f0..f330620bb 100644 --- a/apps/acg-faka/1.3.9/docker-compose.yml +++ b/apps/acg-faka/1.3.9/docker-compose.yml @@ -13,8 +13,5 @@ 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: - - ${ACG_FAKA_ROOT_PATH}/data:/var/www/html + - ${ACG_FAKA_ROOT_PATH}:/var/www/html diff --git a/apps/acg-faka/1.3.9/envs/default.env b/apps/acg-faka/1.3.9/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/acg-faka/1.3.9/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/acg-faka/1.3.9/envs/global.env b/apps/acg-faka/1.3.9/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/acg-faka/1.3.9/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/acg-faka/1.3.9/scripts/init.sh b/apps/acg-faka/1.3.9/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/acg-faka/1.3.9/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/acg-faka/1.3.9/scripts/uninstall.sh b/apps/acg-faka/1.3.9/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/acg-faka/1.3.9/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/acg-faka/1.3.9/scripts/upgrade.sh b/apps/acg-faka/1.3.9/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/acg-faka/1.3.9/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/affine/stable/data.yml b/apps/affine/0.24.1/data.yml similarity index 91% rename from apps/affine/stable/data.yml rename to apps/affine/0.24.1/data.yml index b8db1b92f..34f28897a 100644 --- a/apps/affine/stable/data.yml +++ b/apps/affine/0.24.1/data.yml @@ -41,7 +41,7 @@ additionalProperties: label: en: Password zh: 数据库用户密码 - - default: ~/.affine/self-host/storage + - default: ./.affine/self-host/storage envKey: UPLOAD_LOCATION labelEn: Upload Location labelZh: 上传目录 @@ -50,7 +50,7 @@ additionalProperties: label: en: Upload Location zh: 上传目录 - - default: ~/.affine/self-host/storage + - default: ./.affine/self-host/storage envKey: CONFIG_LOCATION labelEn: Config Location labelZh: 配置目录 @@ -59,7 +59,7 @@ additionalProperties: label: en: Config Location zh: 配置目录 - - default: ~/.affine/self-host/postgres/pgdata + - default: ./.affine/self-host/postgres/pgdata envKey: DB_DATA_LOCATION labelEn: Postgre Data Location labelZh: Postgre 数据目录 diff --git a/apps/affine/stable/docker-compose.yml b/apps/affine/0.24.1/docker-compose.yml similarity index 70% rename from apps/affine/stable/docker-compose.yml rename to apps/affine/0.24.1/docker-compose.yml index 76578b605..741825a7b 100644 --- a/apps/affine/stable/docker-compose.yml +++ b/apps/affine/0.24.1/docker-compose.yml @@ -1,6 +1,6 @@ services: affine: - image: ghcr.io/toeverything/affine-graphql:stable + image: ghcr.io/toeverything/affine:0.24.1 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:3010 @@ -12,7 +12,6 @@ services: affine_migration: condition: service_completed_successfully volumes: - # custom configurations - ${UPLOAD_LOCATION}:/root/.affine/storage - ${CONFIG_LOCATION}:/root/.affine/config environment: @@ -20,20 +19,22 @@ services: - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${DB_DATABASE:-affine} - AFFINE_INDEXER_ENABLED=false networks: - - 1panel-network + - 1panel-network restart: always labels: - createdBy: Apps + createdBy: Apps affine_migration: - image: ghcr.io/toeverything/affine-graphql:stable + image: ghcr.io/toeverything/affine:0.24.1 container_name: ${CONTAINER_NAME}_migration_job volumes: - # custom configurations - ${UPLOAD_LOCATION}:/root/.affine/storage - ${CONFIG_LOCATION}:/root/.affine/config - command: ['sh', '-c', 'node ./scripts/self-host-predeploy.js'] + command: + - sh + - -c + - node ./scripts/self-host-predeploy.js networks: - - 1panel-network + - 1panel-network environment: - REDIS_SERVER_HOST=redis - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${DB_DATABASE:-affine} @@ -44,42 +45,50 @@ services: redis: condition: service_healthy labels: - createdBy: Apps - restart: no + createdBy: Apps + skipStatusCheck: 'true' + restart: 'no' redis: image: redis container_name: ${CONTAINER_NAME}_redis healthcheck: - test: ['CMD', 'redis-cli', '--raw', 'incr', 'ping'] + test: + - CMD + - redis-cli + - --raw + - incr + - ping interval: 10s timeout: 5s retries: 5 networks: - - 1panel-network + - 1panel-network labels: - createdBy: Apps + createdBy: Apps restart: always - postgres: image: pgvector/pgvector:pg16 container_name: ${CONTAINER_NAME}_postgres volumes: - ${DB_DATA_LOCATION}:/var/lib/postgresql/data networks: - - 1panel-network + - 1panel-network labels: - createdBy: Apps + createdBy: Apps environment: POSTGRES_USER: ${DB_USERNAME} POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_DB: ${DB_DATABASE:-affine} - POSTGRES_INITDB_ARGS: '--data-checksums' - # you better set a password for you database - # or you may add 'POSTGRES_HOST_AUTH_METHOD=trust' to ignore postgres security policy + POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_HOST_AUTH_METHOD: trust healthcheck: test: - ['CMD', 'pg_isready', '-U', "${DB_USERNAME}", '-d', "${DB_DATABASE:-affine}"] + - CMD + - pg_isready + - -U + - ${DB_USERNAME} + - -d + - ${DB_DATABASE:-affine} interval: 10s timeout: 5s retries: 5 diff --git a/apps/affine/stable-e98f035/data.yml b/apps/affine/stable-e98f035/data.yml deleted file mode 100644 index bb37886e6..000000000 --- a/apps/affine/stable-e98f035/data.yml +++ /dev/null @@ -1,183 +0,0 @@ -additionalProperties: - formFields: - - child: - default: "" - envKey: PANEL_POSTGRES_SERVICE - required: true - type: service - default: postgresql - envKey: PANEL_POSTGRES_TYPE - labelZh: Postgres 服务 (前置检查) - labelEn: Postgres Service (Pre-check) - required: true - type: apps - values: - - label: PostgreSQL - value: postgresql - - child: - default: "" - envKey: PANEL_REDIS_SERVICE - required: true - type: service - default: redis - envKey: PANEL_REDIS_TYPE - labelZh: Redis 服务 (前置检查) - labelEn: Redis Service (Pre-check) - required: true - type: apps - values: - - label: Redis - value: redis - - default: "/home/affine" - edit: true - envKey: AFFINE_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 3010 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: 5555 - edit: true - envKey: PANEL_APP_PORT_COMMUNICATION - labelZh: 通讯端口 - labelEn: Communication port - required: true - rule: paramPort - type: number - - default: "http://127.0.0.1:3010" - edit: true - envKey: AFFINE_SERVER_EXTERNAL_URL - labelZh: 服务外部地址 - labelEn: Service external address - required: true - type: text - - default: "false" - edit: true - envKey: AFFINE_SERVER_HTTPS - labelZh: 是否启用 HTTPS - labelEn: Enable HTTPS - required: true - type: select - values: - - label: 已开启 - value: "true" - - label: 未开启 - value: "false" - - default: "smtp.163.com" - edit: true - envKey: MAILER_HOST - labelZh: SMTP 服务器地址 - labelEn: SMTP server address - required: true - type: text - - default: 465 - edit: true - envKey: MAILER_PORT - labelZh: SMTP 服务器端口 - labelEn: SMTP server port - required: true - rule: paramPort - type: number - - default: "" - edit: true - envKey: MAILER_SENDER - labelZh: 邮件发送者 - labelEn: Email sender - required: true - type: text - - default: "" - edit: true - envKey: MAILER_USER - labelZh: SMTP 用户名 - labelEn: SMTP username - required: true - type: text - - default: "" - edit: true - envKey: MAILER_PASSWORD - labelZh: SMTP 密码 - labelEn: SMTP password - required: true - type: password - - default: "127.0.0.1" - edit: true - envKey: POSTGRES_HOST - labelZh: 数据库 主机地址 - labelEn: Database Host - required: true - type: text - - default: 5432 - edit: true - envKey: POSTGRES_PORT - labelZh: 数据库 端口 - labelEn: Database Port - required: true - rule: paramPort - type: number - - default: "affine" - edit: true - envKey: POSTGRES_NAME - labelZh: 数据库 名称 - labelEn: Database Name - required: true - rule: paramCommon - type: text - - default: "affine" - edit: true - envKey: POSTGRES_USER - labelZh: 数据库 用户名 - labelEn: Database Username - required: true - type: text - - default: "" - edit: true - envKey: POSTGRES_PASSWORD - labelZh: 数据库 密码 - labelEn: Database Password - random: true - required: true - rule: paramComplexity - type: password - - default: "127.0.0.1" - edit: true - envKey: REDIS_SERVER_HOST - labelZh: Redis 主机 - labelEn: Redis Host - required: true - type: text - - default: 6379 - edit: true - envKey: REDIS_SERVER_PORT - labelZh: Redis 端口 - labelEn: Redis Port - required: true - rule: paramPort - type: number - - default: 0 - edit: true - envKey: REDIS_SERVER_DATABASE - labelZh: Redis 索引 (0-20) - labelEn: Redis Index (0-20) - required: true - type: number - - default: "" - edit: true - envKey: REDIS_SERVER_USER - labelZh: Redis 用户 - labelEn: Redis User - required: false - type: text - - default: "" - edit: true - envKey: REDIS_SERVER_PASSWORD - labelZh: Redis 密码 - labelEn: Redis Password - required: false - type: password diff --git a/apps/affine/stable-e98f035/docker-compose.yml b/apps/affine/stable-e98f035/docker-compose.yml deleted file mode 100644 index cb93027f9..000000000 --- a/apps/affine/stable-e98f035/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - affine: - image: ghcr.io/toeverything/affine-graphql:stable-e98f035 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:3010 - - ${PANEL_APP_PORT_COMMUNICATION}:5555 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ${AFFINE_ROOT_PATH}/config:/root/.affine/config - - ${AFFINE_ROOT_PATH}/storage:/root/.affine/storage - environment: - - NODE_OPTIONS="--import=./scripts/register.js" - - AFFINE_CONFIG_PATH=/root/.affine/config - - REDIS_SERVER_HOST=redis - - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME} - - NODE_ENV=production - - TELEMETRY_ENABLE=false - - AFFINE_SERVER_HOST=localhost - - AFFINE_SERVER_PORT=3010 - - AFFINE_SERVER_HTTPS=false - - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - command: - [ 'sh', '-c', 'node ./scripts/self-host-predeploy && node ./dist/index.js' ] diff --git a/apps/affine/stable-e98f035/envs/default.env b/apps/affine/stable-e98f035/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/affine/stable-e98f035/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/affine/stable-e98f035/envs/global.env b/apps/affine/stable-e98f035/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/affine/stable-e98f035/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/affine/stable-e98f035/scripts/init.sh b/apps/affine/stable-e98f035/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/affine/stable-e98f035/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/affine/stable-e98f035/scripts/uninstall.sh b/apps/affine/stable-e98f035/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/affine/stable-e98f035/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/affine/stable-e98f035/scripts/upgrade.sh b/apps/affine/stable-e98f035/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/affine/stable-e98f035/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/alist-aria2/3.40.0/data.yml b/apps/alist-aria2/3.40.0/data.yml index 0f4fc7a24..d86b6922e 100644 --- a/apps/alist-aria2/3.40.0/data.yml +++ b/apps/alist-aria2/3.40.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/alist" + - default: "./data" edit: true envKey: ALIST_ROOT_PATH labelZh: 数据持久化路径 @@ -15,60 +15,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: JWT_SECRET - labelZh: 加密密钥 - labelEn: Encryption key - required: false - type: password - - default: "" - edit: true - envKey: SITE_URL - labelZh: 站点 URL - labelEn: Site URL - required: false - rule: paramExtUrl - type: text - - default: 48 - edit: true - envKey: TOKEN_EXPIRES_IN - labelZh: 登录过期时间 (小时) - labelEn: Login expiration time (hours) - required: true - type: number - - default: 0 - edit: true - envKey: DELAYED_START - labelZh: 延时启动 (秒) - labelEn: Delayed start (seconds) - required: true - type: number - - default: 0 - edit: true - envKey: max_connections - labelZh: 最大连接数 - labelEn: Maximum connections - required: true - type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/alist-aria2/3.40.0/docker-compose.yml b/apps/alist-aria2/3.40.0/docker-compose.yml index 03bfb07d8..a1bdf1e64 100644 --- a/apps/alist-aria2/3.40.0/docker-compose.yml +++ b/apps/alist-aria2/3.40.0/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: alist-aria2: - image: qyg2297248353/alist-aria2:v3.40.0 + image: xhofe/alist-aria2:v3.40.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -12,14 +12,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5244 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${ALIST_ROOT_PATH}:/opt/alist/data environment: - PUID=0 - PGID=0 diff --git a/apps/alist-aria2/3.40.0/envs/default.env b/apps/alist-aria2/3.40.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/alist-aria2/3.40.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/alist-aria2/3.40.0/envs/global.env b/apps/alist-aria2/3.40.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/alist-aria2/3.40.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/alist-aria2/3.40.0/scripts/init.sh b/apps/alist-aria2/3.40.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-aria2/3.40.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/alist-aria2/3.40.0/scripts/uninstall.sh b/apps/alist-aria2/3.40.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/alist-aria2/3.40.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/alist-aria2/3.40.0/scripts/upgrade.sh b/apps/alist-aria2/3.40.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-aria2/3.40.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/alist-aria2/3.41.0/data.yml b/apps/alist-aria2/3.41.0/data.yml index 0f4fc7a24..d86b6922e 100644 --- a/apps/alist-aria2/3.41.0/data.yml +++ b/apps/alist-aria2/3.41.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/alist" + - default: "./data" edit: true envKey: ALIST_ROOT_PATH labelZh: 数据持久化路径 @@ -15,60 +15,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: JWT_SECRET - labelZh: 加密密钥 - labelEn: Encryption key - required: false - type: password - - default: "" - edit: true - envKey: SITE_URL - labelZh: 站点 URL - labelEn: Site URL - required: false - rule: paramExtUrl - type: text - - default: 48 - edit: true - envKey: TOKEN_EXPIRES_IN - labelZh: 登录过期时间 (小时) - labelEn: Login expiration time (hours) - required: true - type: number - - default: 0 - edit: true - envKey: DELAYED_START - labelZh: 延时启动 (秒) - labelEn: Delayed start (seconds) - required: true - type: number - - default: 0 - edit: true - envKey: max_connections - labelZh: 最大连接数 - labelEn: Maximum connections - required: true - type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/alist-aria2/3.41.0/docker-compose.yml b/apps/alist-aria2/3.41.0/docker-compose.yml index 92163b887..57c7f0382 100644 --- a/apps/alist-aria2/3.41.0/docker-compose.yml +++ b/apps/alist-aria2/3.41.0/docker-compose.yml @@ -12,14 +12,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5244 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${ALIST_ROOT_PATH}:/opt/alist/data environment: - PUID=0 - PGID=0 diff --git a/apps/alist-aria2/3.41.0/envs/default.env b/apps/alist-aria2/3.41.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/alist-aria2/3.41.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/alist-aria2/3.41.0/envs/global.env b/apps/alist-aria2/3.41.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/alist-aria2/3.41.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/alist-aria2/3.41.0/scripts/init.sh b/apps/alist-aria2/3.41.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-aria2/3.41.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/alist-aria2/3.41.0/scripts/uninstall.sh b/apps/alist-aria2/3.41.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/alist-aria2/3.41.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/alist-aria2/3.41.0/scripts/upgrade.sh b/apps/alist-aria2/3.41.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-aria2/3.41.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/byte-muse/license/data.yml b/apps/alist-ffmpeg/3.40.0-ffmpeg/data.yml similarity index 50% rename from apps/byte-muse/license/data.yml rename to apps/alist-ffmpeg/3.40.0-ffmpeg/data.yml index e8fb4861b..d86b6922e 100644 --- a/apps/byte-muse/license/data.yml +++ b/apps/alist-ffmpeg/3.40.0-ffmpeg/data.yml @@ -1,6 +1,13 @@ additionalProperties: formFields: - - default: 5000 + - default: "./data" + edit: true + envKey: ALIST_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 5244 edit: true envKey: PANEL_APP_PORT_HTTP labelZh: WebUI 端口 diff --git a/apps/alist/aria2-latest/docker-compose.yml b/apps/alist-ffmpeg/3.40.0-ffmpeg/docker-compose.yml similarity index 55% rename from apps/alist/aria2-latest/docker-compose.yml rename to apps/alist-ffmpeg/3.40.0-ffmpeg/docker-compose.yml index c782ef597..e87ee9344 100644 --- a/apps/alist/aria2-latest/docker-compose.yml +++ b/apps/alist-ffmpeg/3.40.0-ffmpeg/docker-compose.yml @@ -1,23 +1,21 @@ +networks: + 1panel-network: + external: true services: alist: + image: xhofe/alist:v3.40.0-ffmpeg container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" restart: always networks: - 1panel-network ports: - - "${PANEL_APP_PORT_HTTP}:5244" + - ${PANEL_APP_PORT_HTTP}:5244 volumes: - - "${DATA_PATH}:/opt/alist/data" - - "${MOUNT_PATH}:/mnt/data" + - ${ALIST_ROOT_PATH}:/opt/alist/data environment: - PUID=0 - PGID=0 - UMASK=022 - image: xhofe/alist-aria2:latest - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true - + - FORCE=false diff --git a/apps/alist-ffmpeg/3.40.0/data.yml b/apps/alist-ffmpeg/3.40.0/data.yml deleted file mode 100644 index 0f4fc7a24..000000000 --- a/apps/alist-ffmpeg/3.40.0/data.yml +++ /dev/null @@ -1,74 +0,0 @@ -additionalProperties: - formFields: - - default: "/home/alist" - edit: true - envKey: ALIST_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 5244 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "" - edit: true - envKey: JWT_SECRET - labelZh: 加密密钥 - labelEn: Encryption key - required: false - type: password - - default: "" - edit: true - envKey: SITE_URL - labelZh: 站点 URL - labelEn: Site URL - required: false - rule: paramExtUrl - type: text - - default: 48 - edit: true - envKey: TOKEN_EXPIRES_IN - labelZh: 登录过期时间 (小时) - labelEn: Login expiration time (hours) - required: true - type: number - - default: 0 - edit: true - envKey: DELAYED_START - labelZh: 延时启动 (秒) - labelEn: Delayed start (seconds) - required: true - type: number - - default: 0 - edit: true - envKey: max_connections - labelZh: 最大连接数 - labelEn: Maximum connections - required: true - type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/alist-ffmpeg/3.40.0/docker-compose.yml b/apps/alist-ffmpeg/3.40.0/docker-compose.yml deleted file mode 100644 index f78ad2bbe..000000000 --- a/apps/alist-ffmpeg/3.40.0/docker-compose.yml +++ /dev/null @@ -1,27 +0,0 @@ -networks: - 1panel-network: - external: true -services: - alist: - image: qyg2297248353/alist:v3.40.0-ffmpeg - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:5244 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} - environment: - - PUID=0 - - PGID=0 - - UMASK=022 - - FORCE=false diff --git a/apps/alist-ffmpeg/3.40.0/envs/default.env b/apps/alist-ffmpeg/3.40.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/alist-ffmpeg/3.40.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/alist-ffmpeg/3.40.0/envs/global.env b/apps/alist-ffmpeg/3.40.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/alist-ffmpeg/3.40.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/alist-ffmpeg/3.40.0/scripts/init.sh b/apps/alist-ffmpeg/3.40.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-ffmpeg/3.40.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/alist-ffmpeg/3.40.0/scripts/uninstall.sh b/apps/alist-ffmpeg/3.40.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/alist-ffmpeg/3.40.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh b/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/alist-ffmpeg/3.52.0-ffmpeg/data.yml b/apps/alist-ffmpeg/3.52.0-ffmpeg/data.yml index 0f4fc7a24..d86b6922e 100644 --- a/apps/alist-ffmpeg/3.52.0-ffmpeg/data.yml +++ b/apps/alist-ffmpeg/3.52.0-ffmpeg/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/alist" + - default: "./data" edit: true envKey: ALIST_ROOT_PATH labelZh: 数据持久化路径 @@ -15,60 +15,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: JWT_SECRET - labelZh: 加密密钥 - labelEn: Encryption key - required: false - type: password - - default: "" - edit: true - envKey: SITE_URL - labelZh: 站点 URL - labelEn: Site URL - required: false - rule: paramExtUrl - type: text - - default: 48 - edit: true - envKey: TOKEN_EXPIRES_IN - labelZh: 登录过期时间 (小时) - labelEn: Login expiration time (hours) - required: true - type: number - - default: 0 - edit: true - envKey: DELAYED_START - labelZh: 延时启动 (秒) - labelEn: Delayed start (seconds) - required: true - type: number - - default: 0 - edit: true - envKey: max_connections - labelZh: 最大连接数 - labelEn: Maximum connections - required: true - type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/alist-ffmpeg/3.52.0-ffmpeg/docker-compose.yml b/apps/alist-ffmpeg/3.52.0-ffmpeg/docker-compose.yml index 54fbacf63..20e744e9c 100644 --- a/apps/alist-ffmpeg/3.52.0-ffmpeg/docker-compose.yml +++ b/apps/alist-ffmpeg/3.52.0-ffmpeg/docker-compose.yml @@ -12,14 +12,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5244 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${ALIST_ROOT_PATH}:/opt/alist/data environment: - PUID=0 - PGID=0 diff --git a/apps/alist-ffmpeg/3.52.0-ffmpeg/envs/default.env b/apps/alist-ffmpeg/3.52.0-ffmpeg/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/alist-ffmpeg/3.52.0-ffmpeg/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/alist-ffmpeg/3.52.0-ffmpeg/envs/global.env b/apps/alist-ffmpeg/3.52.0-ffmpeg/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/alist-ffmpeg/3.52.0-ffmpeg/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/init.sh b/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/uninstall.sh b/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/upgrade.sh b/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist-ffmpeg/3.52.0-ffmpeg/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/alist/3.40.0/envs/default.env b/apps/alist/3.40.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/alist/3.40.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/alist/3.40.0/envs/global.env b/apps/alist/3.40.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/alist/3.40.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/alist/3.40.0/scripts/init.sh b/apps/alist/3.40.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist/3.40.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/alist/3.40.0/scripts/uninstall.sh b/apps/alist/3.40.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/alist/3.40.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/alist/3.40.0/scripts/upgrade.sh b/apps/alist/3.40.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist/3.40.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/alist/3.41.0-aria2/data.yml b/apps/alist/3.41.0-aria2/data.yml deleted file mode 100644 index 926c16795..000000000 --- a/apps/alist/3.41.0-aria2/data.yml +++ /dev/null @@ -1,24 +0,0 @@ -additionalProperties: - formFields: - - default: 40034 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: ./data/data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - - default: ./data/mnt - edit: true - envKey: MOUNT_PATH - labelEn: Mount folder path - labelZh: 挂载文件夹路径 - required: true - type: text diff --git a/apps/alist/3.41.0-aria2/docker-compose.yml b/apps/alist/3.41.0-aria2/docker-compose.yml deleted file mode 100644 index c782ef597..000000000 --- a/apps/alist/3.41.0-aria2/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -services: - alist: - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:5244" - volumes: - - "${DATA_PATH}:/opt/alist/data" - - "${MOUNT_PATH}:/mnt/data" - environment: - - PUID=0 - - PGID=0 - - UMASK=022 - image: xhofe/alist-aria2:latest - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true - diff --git a/apps/alist/3.41.0-aria2/env.sample b/apps/alist/3.41.0-aria2/env.sample deleted file mode 100644 index ce9d0b122..000000000 --- a/apps/alist/3.41.0-aria2/env.sample +++ /dev/null @@ -1,4 +0,0 @@ -CONTAINER_NAME="alist" -PANEL_APP_PORT_HTTP="40034" -DATA_PATH="./data/data" -MOUNT_PATH="./data/mnt" \ No newline at end of file diff --git a/apps/alist/3.52.0/envs/default.env b/apps/alist/3.52.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/alist/3.52.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/alist/3.52.0/envs/global.env b/apps/alist/3.52.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/alist/3.52.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/alist/3.52.0/scripts/init.sh b/apps/alist/3.52.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist/3.52.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/alist/3.52.0/scripts/uninstall.sh b/apps/alist/3.52.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/alist/3.52.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/alist/3.52.0/scripts/upgrade.sh b/apps/alist/3.52.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/alist/3.52.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/alist/aria2-latest/data.yml b/apps/alist/aria2-latest/data.yml deleted file mode 100644 index 926c16795..000000000 --- a/apps/alist/aria2-latest/data.yml +++ /dev/null @@ -1,24 +0,0 @@ -additionalProperties: - formFields: - - default: 40034 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: ./data/data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - - default: ./data/mnt - edit: true - envKey: MOUNT_PATH - labelEn: Mount folder path - labelZh: 挂载文件夹路径 - required: true - type: text diff --git a/apps/alist/aria2-latest/env.sample b/apps/alist/aria2-latest/env.sample deleted file mode 100644 index ce9d0b122..000000000 --- a/apps/alist/aria2-latest/env.sample +++ /dev/null @@ -1,4 +0,0 @@ -CONTAINER_NAME="alist" -PANEL_APP_PORT_HTTP="40034" -DATA_PATH="./data/data" -MOUNT_PATH="./data/mnt" \ No newline at end of file diff --git a/apps/ammds-ol8/1.6.26-ol8/data.yml b/apps/ammds-ol8/1.6.26-ol8/data.yml index dddda8115..e61a8094c 100644 --- a/apps/ammds-ol8/1.6.26-ol8/data.yml +++ b/apps/ammds-ol8/1.6.26-ol8/data.yml @@ -1,22 +1,6 @@ additionalProperties: formFields: - - default: "1panel-network" - edit: true - envKey: NETWORK_MODE - labelZh: 网络模式 - labelEn: Network mode - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - - default: "/home/ammds" + - default: "./data" edit: true envKey: AMMDS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/ammds-ol8/1.6.26-ol8/docker-compose.yml b/apps/ammds-ol8/1.6.26-ol8/docker-compose.yml index 99470645b..5daba532f 100644 --- a/apps/ammds-ol8/1.6.26-ol8/docker-compose.yml +++ b/apps/ammds-ol8/1.6.26-ol8/docker-compose.yml @@ -9,7 +9,8 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE:-host} + networks: + - 1panel-network tty: true stdin_open: true ulimits: @@ -18,9 +19,6 @@ services: hard: 524288 ports: - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${AMMDS_ROOT_PATH}/data:/ammds/data - ${AMMDS_ROOT_PATH}/db:/ammds/db @@ -32,3 +30,11 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} + - AMMDS_METATUBE_URL=${AMMDS_METATUBE_URL} + - AMMDS_METATUBE_TOKEN=${AMMDS_METATUBE_TOKEN} + - AMMDS_PROWLARR_URL=${AMMDS_PROWLARR_URL} + - AMMDS_PROWLARR_TOKEN=${AMMDS_PROWLARR_TOKEN} + - AMMDS_IYUU_TOKEN=${AMMDS_IYUU_TOKEN} + - AMMDS_QBITTORRENT_URL=${AMMDS_QBITTORRENT_URL} + - AMMDS_QBITTORRENT_USERNAME=${AMMDS_QBITTORRENT_USERNAME} + - AMMDS_QBITTORRENT_PASSWORD=${AMMDS_QBITTORRENT_PASSWORD} diff --git a/apps/ammds-ol8/1.6.26-ol8/envs/default.env b/apps/ammds-ol8/1.6.26-ol8/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ammds-ol8/1.6.26-ol8/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ammds-ol8/1.6.26-ol8/envs/global.env b/apps/ammds-ol8/1.6.26-ol8/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ammds-ol8/1.6.26-ol8/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ammds-ol8/1.6.26-ol8/scripts/init.sh b/apps/ammds-ol8/1.6.26-ol8/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ammds-ol8/1.6.26-ol8/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/ammds-ol8/1.6.26-ol8/scripts/uninstall.sh b/apps/ammds-ol8/1.6.26-ol8/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ammds-ol8/1.6.26-ol8/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ammds-ol8/1.6.26-ol8/scripts/upgrade.sh b/apps/ammds-ol8/1.6.26-ol8/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ammds-ol8/1.6.26-ol8/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/ammds/1.6.26/data.yml b/apps/ammds/1.6.26/data.yml index dddda8115..e61a8094c 100644 --- a/apps/ammds/1.6.26/data.yml +++ b/apps/ammds/1.6.26/data.yml @@ -1,22 +1,6 @@ additionalProperties: formFields: - - default: "1panel-network" - edit: true - envKey: NETWORK_MODE - labelZh: 网络模式 - labelEn: Network mode - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - - default: "/home/ammds" + - default: "./data" edit: true envKey: AMMDS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/ammds/1.6.26/docker-compose.yml b/apps/ammds/1.6.26/docker-compose.yml index 78ebe9a9e..f0d327686 100644 --- a/apps/ammds/1.6.26/docker-compose.yml +++ b/apps/ammds/1.6.26/docker-compose.yml @@ -9,7 +9,8 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE:-host} + networks: + - 1panel-network tty: true stdin_open: true ulimits: @@ -18,9 +19,6 @@ services: hard: 524288 ports: - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${AMMDS_ROOT_PATH}/data:/ammds/data - ${AMMDS_ROOT_PATH}/db:/ammds/db @@ -32,3 +30,11 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} + - AMMDS_METATUBE_URL=${AMMDS_METATUBE_URL} + - AMMDS_METATUBE_TOKEN=${AMMDS_METATUBE_TOKEN} + - AMMDS_PROWLARR_URL=${AMMDS_PROWLARR_URL} + - AMMDS_PROWLARR_TOKEN=${AMMDS_PROWLARR_TOKEN} + - AMMDS_IYUU_TOKEN=${AMMDS_IYUU_TOKEN} + - AMMDS_QBITTORRENT_URL=${AMMDS_QBITTORRENT_URL} + - AMMDS_QBITTORRENT_USERNAME=${AMMDS_QBITTORRENT_USERNAME} + - AMMDS_QBITTORRENT_PASSWORD=${AMMDS_QBITTORRENT_PASSWORD} diff --git a/apps/ammds/1.6.26/envs/default.env b/apps/ammds/1.6.26/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ammds/1.6.26/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ammds/1.6.26/envs/global.env b/apps/ammds/1.6.26/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ammds/1.6.26/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ammds/1.6.26/scripts/init.sh b/apps/ammds/1.6.26/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ammds/1.6.26/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/ammds/1.6.26/scripts/uninstall.sh b/apps/ammds/1.6.26/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ammds/1.6.26/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ammds/1.6.26/scripts/upgrade.sh b/apps/ammds/1.6.26/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ammds/1.6.26/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/ani-rss/1.2.82/data.yml b/apps/ani-rss/1.2.82/data.yml index 1e348edcb..bfe1d189f 100644 --- a/apps/ani-rss/1.2.82/data.yml +++ b/apps/ani-rss/1.2.82/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/ani-rss" + - default: "./data" edit: true envKey: ANI_RSS_ROOT_PATH labelZh: 数据持久化路径 @@ -15,24 +15,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/ani-rss/1.2.82/docker-compose.yml b/apps/ani-rss/1.2.82/docker-compose.yml index 62996425a..283fb9e2f 100644 --- a/apps/ani-rss/1.2.82/docker-compose.yml +++ b/apps/ani-rss/1.2.82/docker-compose.yml @@ -13,16 +13,10 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:7789 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ANI_RSS_ROOT_PATH}/config:/config - ${ANI_RSS_ROOT_PATH}/downloads:/downloads - ${ANI_RSS_ROOT_PATH}/Media:/Media - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} environment: - PORT=7789 - CONFIG=/config diff --git a/apps/ani-rss/1.2.82/envs/default.env b/apps/ani-rss/1.2.82/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ani-rss/1.2.82/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ani-rss/1.2.82/envs/global.env b/apps/ani-rss/1.2.82/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ani-rss/1.2.82/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ani-rss/1.2.82/scripts/init.sh b/apps/ani-rss/1.2.82/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ani-rss/1.2.82/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/ani-rss/1.2.82/scripts/uninstall.sh b/apps/ani-rss/1.2.82/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ani-rss/1.2.82/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ani-rss/1.2.82/scripts/upgrade.sh b/apps/ani-rss/1.2.82/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ani-rss/1.2.82/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/ani-rss/2.2.1/data.yml b/apps/ani-rss/2.2.1/data.yml index 1e348edcb..bfe1d189f 100644 --- a/apps/ani-rss/2.2.1/data.yml +++ b/apps/ani-rss/2.2.1/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/ani-rss" + - default: "./data" edit: true envKey: ANI_RSS_ROOT_PATH labelZh: 数据持久化路径 @@ -15,24 +15,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/ani-rss/2.2.1/docker-compose.yml b/apps/ani-rss/2.2.1/docker-compose.yml index 24bf6f29f..8dd79433e 100644 --- a/apps/ani-rss/2.2.1/docker-compose.yml +++ b/apps/ani-rss/2.2.1/docker-compose.yml @@ -13,16 +13,10 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:7789 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ANI_RSS_ROOT_PATH}/config:/config - ${ANI_RSS_ROOT_PATH}/downloads:/downloads - ${ANI_RSS_ROOT_PATH}/Media:/Media - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} environment: - PUID=0 - PGID=0 diff --git a/apps/ani-rss/2.2.1/envs/default.env b/apps/ani-rss/2.2.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ani-rss/2.2.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ani-rss/2.2.1/envs/global.env b/apps/ani-rss/2.2.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ani-rss/2.2.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ani-rss/2.2.1/scripts/init.sh b/apps/ani-rss/2.2.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ani-rss/2.2.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/ani-rss/2.2.1/scripts/uninstall.sh b/apps/ani-rss/2.2.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ani-rss/2.2.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ani-rss/2.2.1/scripts/upgrade.sh b/apps/ani-rss/2.2.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ani-rss/2.2.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/apifox-runner/1.4.0/data.yml b/apps/apifox-runner/1.4.0/data.yml index 2a90784cd..4a9f43926 100644 --- a/apps/apifox-runner/1.4.0/data.yml +++ b/apps/apifox-runner/1.4.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/apifox-runner" + - default: "./data" edit: true envKey: APIFOX_RUNNER_ROOT_PATH labelZh: 数据持久化路径 @@ -15,7 +15,7 @@ additionalProperties: required: true rule: paramPort type: number - - default: "http://127.0.0.1:4524" + - default: "https://api.apifox.cn" edit: true envKey: SERVER_APP_BASE_URL labelZh: 应用服务地址 diff --git a/apps/apifox-runner/1.4.0/docker-compose.yml b/apps/apifox-runner/1.4.0/docker-compose.yml index f6e91850e..a703fadd3 100644 --- a/apps/apifox-runner/1.4.0/docker-compose.yml +++ b/apps/apifox-runner/1.4.0/docker-compose.yml @@ -13,10 +13,11 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:4524 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${APIFOX_RUNNER_ROOT_PATH}/runner:/opt/runner environment: - TZ=Asia/Shanghai + - SERVER_APP_BASE_URL=${SERVER_APP_BASE_URL} + - TEAM_ID=${TEAM_ID} + - RUNNER_ID=${RUNNER_ID} + - ACCESS_TOKEN=${ACCESS_TOKEN} diff --git a/apps/apifox-runner/1.4.0/envs/default.env b/apps/apifox-runner/1.4.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/apifox-runner/1.4.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/apifox-runner/1.4.0/envs/global.env b/apps/apifox-runner/1.4.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/apifox-runner/1.4.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/apifox-runner/1.4.0/scripts/init.sh b/apps/apifox-runner/1.4.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/apifox-runner/1.4.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/apifox-runner/1.4.0/scripts/uninstall.sh b/apps/apifox-runner/1.4.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/apifox-runner/1.4.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/apifox-runner/1.4.0/scripts/upgrade.sh b/apps/apifox-runner/1.4.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/apifox-runner/1.4.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/apifox-runner/README.md b/apps/apifox-runner/README.md index ca590535d..5460d9591 100644 --- a/apps/apifox-runner/README.md +++ b/apps/apifox-runner/README.md @@ -41,15 +41,19 @@ API 文档和 API 开发调试使用同一个工具，API 调试完成后即可 ### 访问令牌 (Access Token) -请在ApiFox客户端，前往主窗口 `团队资源` >> `通用 Runner` 获取访问令牌 +进入 [ApiFox Web 端](https://app.apifox.com/)，前往主窗口 `团队资源` >> `通用 Runner` >> `部署通用 Runner` 获取访问令牌 + +![](https://f.pz.al/pzal/2025/08/30/4b0a0b821a644.png) + +![](https://f.pz.al/pzal/2025/08/30/914c00ba58d20.png) ### 团队 ID (Team ID) -请在ApiFox客户端，前往主窗口 `团队设置` 获取团队 ID +同上 ### Runner ID -请在ApiFox客户端，前往主窗口 `团队资源` >> `通用 Runner` 获取 Runner ID +同上 --- diff --git a/apps/archivebox/0.7.3/data.yml b/apps/archivebox/0.7.3/data.yml index 8cb57dd82..b221aa916 100644 --- a/apps/archivebox/0.7.3/data.yml +++ b/apps/archivebox/0.7.3/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/archivebox" + - default: "./archivebox_data" edit: true envKey: ARCHIVEBOX_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/archivebox/0.7.3/docker-compose.yml b/apps/archivebox/0.7.3/docker-compose.yml index fce6b5115..4d04458a8 100644 --- a/apps/archivebox/0.7.3/docker-compose.yml +++ b/apps/archivebox/0.7.3/docker-compose.yml @@ -13,15 +13,17 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data environment: - TZ=Asia/Shanghai + - ADMIN_USERNAME=${ADMIN_USERNAME} + - ADMIN_PASSWORD=${ADMIN_PASSWORD} - ALLOWED_HOSTS=* - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - PUBLIC_INDEX=${} + - PUBLIC_SNAPSHOTS=${} + - PUBLIC_ADD_VIEW=${} - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} @@ -34,9 +36,6 @@ services: - 1panel-network expose: - 1491 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store environment: diff --git a/apps/archivebox/0.7.3/envs/default.env b/apps/archivebox/0.7.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/archivebox/0.7.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/archivebox/0.7.3/envs/global.env b/apps/archivebox/0.7.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/archivebox/0.7.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/archivebox/0.7.3/scripts/init.sh b/apps/archivebox/0.7.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/archivebox/0.7.3/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/archivebox/0.7.3/scripts/uninstall.sh b/apps/archivebox/0.7.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/archivebox/0.7.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/archivebox/0.7.3/scripts/upgrade.sh b/apps/archivebox/0.7.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/archivebox/0.7.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/archivebox/0.8.5rc51/data.yml b/apps/archivebox/0.8.5rc51/data.yml index 8cb57dd82..b221aa916 100644 --- a/apps/archivebox/0.8.5rc51/data.yml +++ b/apps/archivebox/0.8.5rc51/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/archivebox" + - default: "./archivebox_data" edit: true envKey: ARCHIVEBOX_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/archivebox/0.8.5rc51/docker-compose.yml b/apps/archivebox/0.8.5rc51/docker-compose.yml index e547e2dbb..cd8c8a8b7 100644 --- a/apps/archivebox/0.8.5rc51/docker-compose.yml +++ b/apps/archivebox/0.8.5rc51/docker-compose.yml @@ -15,15 +15,17 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data environment: - TZ=Asia/Shanghai + - ADMIN_USERNAME=${ADMIN_USERNAME} + - ADMIN_PASSWORD=${ADMIN_PASSWORD} - ALLOWED_HOSTS=* - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - PUBLIC_INDEX=${} + - PUBLIC_SNAPSHOTS=${} + - PUBLIC_ADD_VIEW=${} - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} @@ -36,15 +38,17 @@ services: networks: - 1panel-network command: archivebox init - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data environment: - TZ=Asia/Shanghai + - ADMIN_USERNAME=${ADMIN_USERNAME} + - ADMIN_PASSWORD=${ADMIN_PASSWORD} - ALLOWED_HOSTS=* - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - PUBLIC_INDEX=${} + - PUBLIC_SNAPSHOTS=${} + - PUBLIC_ADD_VIEW=${} - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} @@ -57,9 +61,6 @@ services: - 1panel-network expose: - 1491 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store environment: diff --git a/apps/archivebox/0.8.5rc51/envs/default.env b/apps/archivebox/0.8.5rc51/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/archivebox/0.8.5rc51/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/archivebox/0.8.5rc51/envs/global.env b/apps/archivebox/0.8.5rc51/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/archivebox/0.8.5rc51/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/archivebox/0.8.5rc51/scripts/init.sh b/apps/archivebox/0.8.5rc51/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/archivebox/0.8.5rc51/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/archivebox/0.8.5rc51/scripts/uninstall.sh b/apps/archivebox/0.8.5rc51/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/archivebox/0.8.5rc51/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/archivebox/0.8.5rc51/scripts/upgrade.sh b/apps/archivebox/0.8.5rc51/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/archivebox/0.8.5rc51/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/aria2-superng6/stable-25-06-09/data.yml b/apps/aria2-superng6/25-08-29/data.yml similarity index 87% rename from apps/aria2-superng6/stable-25-06-09/data.yml rename to apps/aria2-superng6/25-08-29/data.yml index 08cab986d..06d09e2f7 100644 --- a/apps/aria2-superng6/stable-25-06-09/data.yml +++ b/apps/aria2-superng6/25-08-29/data.yml @@ -1,28 +1,19 @@ additionalProperties: formFields: - - default: "host" - 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/aria2" + - default: "./superng6_aria2_data" edit: true envKey: ARIA2_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text + - default: "./downloads" + edit: true + envKey: ARIA2_DOWNLOADS_PATH + labelZh: 下载文件保存路径 + labelEn: Data persistence path + required: true + type: text - default: 8080 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/aria2-superng6/stable-25-06-09/docker-compose.yml b/apps/aria2-superng6/25-08-29/docker-compose.yml similarity index 70% rename from apps/aria2-superng6/stable-25-06-09/docker-compose.yml rename to apps/aria2-superng6/25-08-29/docker-compose.yml index 98b7ceb57..8e8ab423e 100644 --- a/apps/aria2-superng6/stable-25-06-09/docker-compose.yml +++ b/apps/aria2-superng6/25-08-29/docker-compose.yml @@ -3,12 +3,13 @@ networks: external: true services: aria2-superng6: - image: superng6/aria2:stable-25-06-09 + image: superng6/aria2:25-08-29 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network cap_add: - NET_ADMIN ports: @@ -16,19 +17,17 @@ services: - ${PANEL_APP_PORT_RPC}:6800 - ${PANEL_APP_PORT_BTPORT}:32516 - ${PANEL_APP_PORT_BTPORT}:32516/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${ARIA2_ROOT_PATH}/downloads:/downloads + - ${ARIA2_DOWNLOADS_PATH}:/downloads - ${ARIA2_ROOT_PATH}/config:/config - /lib/modules:/lib/modules environment: - PUID=0 - PGID=0 - UMASK=022 + - PORT=6800 - WEBUI=true - - WEBUI_PORT=${PANEL_APP_PORT_HTTP} + - WEBUI_PORT=8080 - BTPORT=${PANEL_APP_PORT_BTPORT} - PORT=${PANEL_APP_PORT_RPC} - UT=true @@ -36,3 +35,9 @@ services: - SMD=true - CRA2B=2h - QUIET=true + - SECRET=${SECRET} + - CACHE=${CACHE} + - CTU=${CTU} + - FA=${FA} + - CRA2B=${CRA2B} + - QUIET=${QUIET} diff --git a/apps/aria2-superng6/data.yml b/apps/aria2-superng6/data.yml index 3b1071f57..4e0d37876 100644 --- a/apps/aria2-superng6/data.yml +++ b/apps/aria2-superng6/data.yml @@ -11,5 +11,5 @@ crossVersionUpdate: true limit: 0 website: https://github.com/SuperNG6/docker-aria2/ - github: https://github.com/aria2/aria2/ + github: https://github.com/SuperNG6/docker-aria2/ document: https://github.com/SuperNG6/docker-aria2/ diff --git a/apps/aria2-superng6/stable-25-06-09/envs/default.env b/apps/aria2-superng6/stable-25-06-09/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/aria2-superng6/stable-25-06-09/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/aria2-superng6/stable-25-06-09/envs/global.env b/apps/aria2-superng6/stable-25-06-09/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/aria2-superng6/stable-25-06-09/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/aria2-superng6/stable-25-06-09/scripts/init.sh b/apps/aria2-superng6/stable-25-06-09/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/aria2-superng6/stable-25-06-09/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/aria2-superng6/stable-25-06-09/scripts/uninstall.sh b/apps/aria2-superng6/stable-25-06-09/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/aria2-superng6/stable-25-06-09/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/aria2-superng6/stable-25-06-09/scripts/upgrade.sh b/apps/aria2-superng6/stable-25-06-09/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/aria2-superng6/stable-25-06-09/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/artalk/2.9.1/envs/default.env b/apps/artalk/2.9.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/artalk/2.9.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/artalk/2.9.1/envs/global.env b/apps/artalk/2.9.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/artalk/2.9.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/artalk/2.9.1/scripts/init.sh b/apps/artalk/2.9.1/scripts/init.sh deleted file mode 100644 index 5e9dcca05..000000000 --- a/apps/artalk/2.9.1/scripts/init.sh +++ /dev/null @@ -1,30 +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 - - DATA_DIR="$ARTALK_ROOT_PATH/data" - - mkdir -p "$DATA_DIR" - - OUTPUT_FILE="$DATA_DIR/ip2region.xdb" - - URL1="https://gh-proxy.com/?q=https%3A%2F%2Fgithub.com%2Flionsoul2014%2Fip2region%2Fblob%2Fmaster%2Fdata%2Fip2region.xdb" - URL2="https://github.com/lionsoul2014/ip2region/raw/master/data/ip2region.xdb" - - curl -L "$URL1" -o "$OUTPUT_FILE" || curl -L "$URL2" -o "$OUTPUT_FILE" - - chmod -R 777 "$DATA_DIR" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/artalk/2.9.1/scripts/uninstall.sh b/apps/artalk/2.9.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/artalk/2.9.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/artalk/2.9.1/scripts/upgrade.sh b/apps/artalk/2.9.1/scripts/upgrade.sh deleted file mode 100644 index 5e9dcca05..000000000 --- a/apps/artalk/2.9.1/scripts/upgrade.sh +++ /dev/null @@ -1,30 +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 - - DATA_DIR="$ARTALK_ROOT_PATH/data" - - mkdir -p "$DATA_DIR" - - OUTPUT_FILE="$DATA_DIR/ip2region.xdb" - - URL1="https://gh-proxy.com/?q=https%3A%2F%2Fgithub.com%2Flionsoul2014%2Fip2region%2Fblob%2Fmaster%2Fdata%2Fip2region.xdb" - URL2="https://github.com/lionsoul2014/ip2region/raw/master/data/ip2region.xdb" - - curl -L "$URL1" -o "$OUTPUT_FILE" || curl -L "$URL2" -o "$OUTPUT_FILE" - - chmod -R 777 "$DATA_DIR" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/astrbot-napcat/4.8.102/data.yml b/apps/astrbot-napcat/4.8.102/data.yml index 1d39da663..6d3d149e3 100644 --- a/apps/astrbot-napcat/4.8.102/data.yml +++ b/apps/astrbot-napcat/4.8.102/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/astrbot-napcat" + - default: "./astrbot-napcat-data" edit: true envKey: ASTRBOT_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/astrbot-napcat/4.8.102/docker-compose.yml b/apps/astrbot-napcat/4.8.102/docker-compose.yml index a9acdd36a..b1d4ed033 100644 --- a/apps/astrbot-napcat/4.8.102/docker-compose.yml +++ b/apps/astrbot-napcat/4.8.102/docker-compose.yml @@ -12,9 +12,6 @@ services: ports: - ${PANEL_APP_PORT_NAPCAT}:6099 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ASTRBOT_ROOT_PATH}/data:/AstrBot/data - ${ASTRBOT_ROOT_PATH}/ntqq:/app/.config/QQ @@ -37,9 +34,6 @@ services: - ${PANEL_APP_PORT_QQ_API}:6196 - ${PANEL_APP_PORT_WECOM}:6195 - ${PANEL_APP_PORT_WECHAT}:11451 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - /etc/localtime:/etc/localtime:ro - ${ASTRBOT_ROOT_PATH}/data:/AstrBot/data diff --git a/apps/astrbot-napcat/4.8.102/envs/default.env b/apps/astrbot-napcat/4.8.102/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/astrbot-napcat/4.8.102/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/astrbot-napcat/4.8.102/envs/global.env b/apps/astrbot-napcat/4.8.102/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/astrbot-napcat/4.8.102/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/astrbot-napcat/4.8.102/scripts/init.sh b/apps/astrbot-napcat/4.8.102/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/astrbot-napcat/4.8.102/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/astrbot-napcat/4.8.102/scripts/uninstall.sh b/apps/astrbot-napcat/4.8.102/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/astrbot-napcat/4.8.102/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/astrbot-napcat/4.8.102/scripts/upgrade.sh b/apps/astrbot-napcat/4.8.102/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/astrbot-napcat/4.8.102/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/astrbot/3.5.25/data.yml b/apps/astrbot/3.5.25/data.yml index ccf1e6995..87cd2493c 100644 --- a/apps/astrbot/3.5.25/data.yml +++ b/apps/astrbot/3.5.25/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/astrbot" + - default: "./data" edit: true envKey: ASTRBOT_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/astrbot/3.5.25/docker-compose.yml b/apps/astrbot/3.5.25/docker-compose.yml index e5a861dd5..85216a984 100644 --- a/apps/astrbot/3.5.25/docker-compose.yml +++ b/apps/astrbot/3.5.25/docker-compose.yml @@ -17,11 +17,8 @@ services: - ${PANEL_APP_PORT_QQ_API}:6196 - ${PANEL_APP_PORT_WECOM}:6195 - ${PANEL_APP_PORT_WECHAT}:11451 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - /etc/localtime:/etc/localtime:ro - - ${ASTRBOT_ROOT_PATH}/data:/AstrBot/data + - ${ASTRBOT_ROOT_PATH}:/AstrBot/data environment: - TZ=Asia/Shanghai diff --git a/apps/astrbot/3.5.25/envs/default.env b/apps/astrbot/3.5.25/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/astrbot/3.5.25/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/astrbot/3.5.25/envs/global.env b/apps/astrbot/3.5.25/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/astrbot/3.5.25/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/astrbot/3.5.25/scripts/init.sh b/apps/astrbot/3.5.25/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/astrbot/3.5.25/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/astrbot/3.5.25/scripts/uninstall.sh b/apps/astrbot/3.5.25/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/astrbot/3.5.25/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/astrbot/3.5.25/scripts/upgrade.sh b/apps/astrbot/3.5.25/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/astrbot/3.5.25/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/baota/10.0_lts/data.yml b/apps/baota/10.0_lts/data.yml index 4d13b5b69..dcb607741 100644 --- a/apps/baota/10.0_lts/data.yml +++ b/apps/baota/10.0_lts/data.yml @@ -1,28 +1,12 @@ additionalProperties: formFields: - - default: "/home/baota" + - default: "./data" edit: true envKey: BAOTA_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text - - default: "host" - 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: 8888 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/baota/10.0_lts/docker-compose.yml b/apps/baota/10.0_lts/docker-compose.yml index 1fe65a17f..d40e02e7c 100644 --- a/apps/baota/10.0_lts/docker-compose.yml +++ b/apps/baota/10.0_lts/docker-compose.yml @@ -9,7 +9,8 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8888 - ${PANEL_APP_PORT_WEB_HTTP}:80 @@ -18,9 +19,6 @@ services: - ${PANEL_APP_PORT_SSH}:22 - ${PANEL_APP_PORT_MYSQL}:3306 - ${PANEL_APP_PORT_PHPADMIN}:888 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BAOTA_ROOT_PATH}/wwwroot:/www/wwwroot - ${BAOTA_ROOT_PATH}/data:/www/server/data diff --git a/apps/baota/10.0_lts/envs/default.env b/apps/baota/10.0_lts/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/baota/10.0_lts/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/baota/10.0_lts/envs/global.env b/apps/baota/10.0_lts/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/baota/10.0_lts/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/baota/10.0_lts/scripts/init.sh b/apps/baota/10.0_lts/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/baota/10.0_lts/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/baota/10.0_lts/scripts/uninstall.sh b/apps/baota/10.0_lts/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/baota/10.0_lts/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/baota/10.0_lts/scripts/upgrade.sh b/apps/baota/10.0_lts/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/baota/10.0_lts/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/bark/2.2.5/envs/default.env b/apps/bark/2.2.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/bark/2.2.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/bark/2.2.5/envs/global.env b/apps/bark/2.2.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/bark/2.2.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/bark/2.2.5/scripts/init.sh b/apps/bark/2.2.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bark/2.2.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/bark/2.2.5/scripts/uninstall.sh b/apps/bark/2.2.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/bark/2.2.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/bark/2.2.5/scripts/upgrade.sh b/apps/bark/2.2.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bark/2.2.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/beszel-agent/0.12.6/envs/default.env b/apps/beszel-agent/0.12.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/beszel-agent/0.12.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/beszel-agent/0.12.6/envs/global.env b/apps/beszel-agent/0.12.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/beszel-agent/0.12.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/beszel-agent/0.12.6/scripts/init.sh b/apps/beszel-agent/0.12.6/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/beszel-agent/0.12.6/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/beszel-agent/0.12.6/scripts/uninstall.sh b/apps/beszel-agent/0.12.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/beszel-agent/0.12.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/beszel-agent/0.12.6/scripts/upgrade.sh b/apps/beszel-agent/0.12.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/beszel-agent/0.12.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/beszel/0.12.6/envs/default.env b/apps/beszel/0.12.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/beszel/0.12.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/beszel/0.12.6/envs/global.env b/apps/beszel/0.12.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/beszel/0.12.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/beszel/0.12.6/scripts/init.sh b/apps/beszel/0.12.6/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/beszel/0.12.6/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/beszel/0.12.6/scripts/uninstall.sh b/apps/beszel/0.12.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/beszel/0.12.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/beszel/0.12.6/scripts/upgrade.sh b/apps/beszel/0.12.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/beszel/0.12.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/bili-fetcher/1.6.5/data.yml b/apps/bili-fetcher/1.6.5/data.yml index 3ec6c2ba2..ba0c80ca2 100644 --- a/apps/bili-fetcher/1.6.5/data.yml +++ b/apps/bili-fetcher/1.6.5/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/bili-fetcher" + - default: "./data" edit: true envKey: BILI_FETCHER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/bili-fetcher/1.6.5/docker-compose.yml b/apps/bili-fetcher/1.6.5/docker-compose.yml index 5bc94fafc..fbea0dd8a 100644 --- a/apps/bili-fetcher/1.6.5/docker-compose.yml +++ b/apps/bili-fetcher/1.6.5/docker-compose.yml @@ -11,9 +11,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_API}:8899 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BILI_FETCHER_ROOT_PATH}/config:/app/config - ${BILI_FETCHER_ROOT_PATH}/output:/app/output diff --git a/apps/bili-fetcher/1.6.5/envs/default.env b/apps/bili-fetcher/1.6.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/bili-fetcher/1.6.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/bili-fetcher/1.6.5/envs/global.env b/apps/bili-fetcher/1.6.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/bili-fetcher/1.6.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/bili-fetcher/1.6.5/scripts/init.sh b/apps/bili-fetcher/1.6.5/scripts/init.sh index eb4ce4cc8..c92740cd1 100644 --- a/apps/bili-fetcher/1.6.5/scripts/init.sh +++ b/apps/bili-fetcher/1.6.5/scripts/init.sh @@ -3,13 +3,6 @@ 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 - if [ ! -d $BILI_FETCHER_ROOT_PATH/config ]; then mkdir -p $BILI_FETCHER_ROOT_PATH/config fi diff --git a/apps/bili-fetcher/1.6.5/scripts/uninstall.sh b/apps/bili-fetcher/1.6.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/bili-fetcher/1.6.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/bili-fetcher/1.6.5/scripts/upgrade.sh b/apps/bili-fetcher/1.6.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bili-fetcher/1.6.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/bili-fetcher/latest/data.yml b/apps/bili-fetcher/latest/data.yml index 3ec6c2ba2..ba0c80ca2 100644 --- a/apps/bili-fetcher/latest/data.yml +++ b/apps/bili-fetcher/latest/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/bili-fetcher" + - default: "./data" edit: true envKey: BILI_FETCHER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/bili-fetcher/latest/docker-compose.yml b/apps/bili-fetcher/latest/docker-compose.yml index f3c300156..9fc733dba 100644 --- a/apps/bili-fetcher/latest/docker-compose.yml +++ b/apps/bili-fetcher/latest/docker-compose.yml @@ -11,9 +11,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_API}:8899 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BILI_FETCHER_ROOT_PATH}/config:/app/config - ${BILI_FETCHER_ROOT_PATH}/output:/app/output diff --git a/apps/bili-fetcher/latest/envs/default.env b/apps/bili-fetcher/latest/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/bili-fetcher/latest/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/bili-fetcher/latest/envs/global.env b/apps/bili-fetcher/latest/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/bili-fetcher/latest/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/bili-fetcher/latest/scripts/init.sh b/apps/bili-fetcher/latest/scripts/init.sh deleted file mode 100644 index eb4ce4cc8..000000000 --- a/apps/bili-fetcher/latest/scripts/init.sh +++ /dev/null @@ -1,22 +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 - - if [ ! -d $BILI_FETCHER_ROOT_PATH/config ]; then - mkdir -p $BILI_FETCHER_ROOT_PATH/config - fi - cp -rn ./config/* $BILI_FETCHER_ROOT_PATH/config/ - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/bili-fetcher/latest/scripts/uninstall.sh b/apps/bili-fetcher/latest/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/bili-fetcher/latest/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/bili-fetcher/latest/scripts/upgrade.sh b/apps/bili-fetcher/latest/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bili-fetcher/latest/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/bitmagnet/0.10.0/data.yml b/apps/bitmagnet/0.10.0/data.yml index 328f0a772..542ffb288 100644 --- a/apps/bitmagnet/0.10.0/data.yml +++ b/apps/bitmagnet/0.10.0/data.yml @@ -14,7 +14,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/bitmagnet" + - default: "./data" edit: true envKey: BITMAGNET_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/bitmagnet/0.10.0/docker-compose.yml b/apps/bitmagnet/0.10.0/docker-compose.yml index 78779b3dc..8e33dec8b 100644 --- a/apps/bitmagnet/0.10.0/docker-compose.yml +++ b/apps/bitmagnet/0.10.0/docker-compose.yml @@ -18,9 +18,6 @@ services: - ${PANEL_APP_PORT_HTTP}:3333 - ${PANEL_APP_PORT_BT}:3334/tcp - ${PANEL_APP_PORT_BT}:3334/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BITMAGNET_ROOT_PATH}/config:/root/.config/bitmagnet - ${BITMAGNET_ROOT_PATH}/bitmagnet:/root/.local/share/bitmagnet @@ -31,6 +28,12 @@ services: - LOG_JSON=false - DHT_CRAWLER_SAVE_FILES_THRESHOLD=100 - PROCESSOR_CONCURRENCY=1 + - POSTGRES_HOST=${POSTGRES_HOST}:${DB_PORT} + - POSTGRES_NAME=${POSTGRES_NAME} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - TMDB_ENABLED=${TMDB_ENABLED} + - TMDB_API_KEY=${TMDB_API_KEY} command: - worker - run diff --git a/apps/bitmagnet/0.10.0/envs/default.env b/apps/bitmagnet/0.10.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/bitmagnet/0.10.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/bitmagnet/0.10.0/envs/global.env b/apps/bitmagnet/0.10.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/bitmagnet/0.10.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/bitmagnet/0.10.0/scripts/init.sh b/apps/bitmagnet/0.10.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bitmagnet/0.10.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/bitmagnet/0.10.0/scripts/uninstall.sh b/apps/bitmagnet/0.10.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/bitmagnet/0.10.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/bitmagnet/0.10.0/scripts/upgrade.sh b/apps/bitmagnet/0.10.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bitmagnet/0.10.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/bonita/0.11.0/data.yml b/apps/bonita/0.11.0/data.yml index 752da3a7b..598dc3ebd 100644 --- a/apps/bonita/0.11.0/data.yml +++ b/apps/bonita/0.11.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/bonita" + - default: "./data" edit: true envKey: BONITA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/bonita/0.11.0/docker-compose.yml b/apps/bonita/0.11.0/docker-compose.yml index 46f7f4d1d..879723e05 100644 --- a/apps/bonita/0.11.0/docker-compose.yml +++ b/apps/bonita/0.11.0/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:12346 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BONITA_ROOT_PATH}/data:/app/backend/data - ${BONITA_ROOT_PATH}/media:/media @@ -23,3 +20,6 @@ services: - PUID=0 - PGID=0 - TZ=Asia/Shanghai + - FIRST_SUPERUSER_EMAIL=${FIRST_SUPERUSER_EMAIL} + - FIRST_SUPERUSER_PASSWORD=${FIRST_SUPERUSER_PASSWORD} + - MAX_CONCURRENCY=${MAX_CONCURRENCY} diff --git a/apps/bonita/0.11.0/envs/default.env b/apps/bonita/0.11.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/bonita/0.11.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/bonita/0.11.0/envs/global.env b/apps/bonita/0.11.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/bonita/0.11.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/bonita/0.11.0/scripts/init.sh b/apps/bonita/0.11.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bonita/0.11.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/bonita/0.11.0/scripts/uninstall.sh b/apps/bonita/0.11.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/bonita/0.11.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/bonita/0.11.0/scripts/upgrade.sh b/apps/bonita/0.11.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bonita/0.11.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/bookstack/v25.05.1-ls209/data.yml b/apps/bookstack/25.07.2/data.yml similarity index 98% rename from apps/bookstack/v25.05.1-ls209/data.yml rename to apps/bookstack/25.07.2/data.yml index c05372159..255e6442a 100644 --- a/apps/bookstack/v25.05.1-ls209/data.yml +++ b/apps/bookstack/25.07.2/data.yml @@ -19,7 +19,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/bookstack" + - default: "./data" edit: true envKey: BOOKSTACK_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/bookstack/v25.05.1-ls209/docker-compose.yml b/apps/bookstack/25.07.2/docker-compose.yml similarity index 62% rename from apps/bookstack/v25.05.1-ls209/docker-compose.yml rename to apps/bookstack/25.07.2/docker-compose.yml index d50d8583e..6fbe2b76a 100644 --- a/apps/bookstack/v25.05.1-ls209/docker-compose.yml +++ b/apps/bookstack/25.07.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: bookstack: - image: linuxserver/bookstack:v25.05.1-ls209 + image: linuxserver/bookstack:25.07.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -13,9 +13,6 @@ 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: - ${BOOKSTACK_ROOT_PATH}/config:/config environment: @@ -23,3 +20,10 @@ services: - PUID=1000 - PGID=1000 - QUEUE_CONNECTION=database + - APP_URL=${APP_URL} + - APP_KEY=${APP_KEY} + - DB_HOST=${DB_HOST} + - DB_PORT=${DB_PORT} + - DB_DATABASE=${DB_DATABASE} + - DB_USERNAME=${DB_USERNAME} + - DB_PASSWORD=${DB_PASSWORD} diff --git a/apps/bookstack/v25.05.1-ls209/envs/default.env b/apps/bookstack/v25.05.1-ls209/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/bookstack/v25.05.1-ls209/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/bookstack/v25.05.1-ls209/envs/global.env b/apps/bookstack/v25.05.1-ls209/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/bookstack/v25.05.1-ls209/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/bookstack/v25.05.1-ls209/scripts/init.sh b/apps/bookstack/v25.05.1-ls209/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bookstack/v25.05.1-ls209/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/bookstack/v25.05.1-ls209/scripts/uninstall.sh b/apps/bookstack/v25.05.1-ls209/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/bookstack/v25.05.1-ls209/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/bookstack/v25.05.1-ls209/scripts/upgrade.sh b/apps/bookstack/v25.05.1-ls209/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/bookstack/v25.05.1-ls209/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/byte-muse/1.18.4/data.yml b/apps/byte-muse/1.18.4/data.yml index afb77844a..b637f90d5 100644 --- a/apps/byte-muse/1.18.4/data.yml +++ b/apps/byte-muse/1.18.4/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/byte-muse" + - default: "./data" edit: true envKey: AUTO_LADY_ROOT_PATH labelZh: 数据持久化路径 @@ -15,27 +15,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text - default: "" edit: true envKey: HTTP_PROXY diff --git a/apps/byte-muse/1.18.4/docker-compose.yml b/apps/byte-muse/1.18.4/docker-compose.yml index 336848aa7..b3d7fd422 100644 --- a/apps/byte-muse/1.18.4/docker-compose.yml +++ b/apps/byte-muse/1.18.4/docker-compose.yml @@ -13,14 +13,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: - ${AUTO_LADY_ROOT_PATH}/config:/data - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} environment: - HTTPS_PROXY=${HTTP_PROXY} - HTTP_PROXY=${HTTP_PROXY:-} diff --git a/apps/byte-muse/1.18.4/envs/default.env b/apps/byte-muse/1.18.4/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/byte-muse/1.18.4/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/byte-muse/1.18.4/envs/global.env b/apps/byte-muse/1.18.4/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/byte-muse/1.18.4/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/byte-muse/1.18.4/scripts/init.sh b/apps/byte-muse/1.18.4/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/byte-muse/1.18.4/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/byte-muse/1.18.4/scripts/uninstall.sh b/apps/byte-muse/1.18.4/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/byte-muse/1.18.4/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/byte-muse/1.18.4/scripts/upgrade.sh b/apps/byte-muse/1.18.4/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/byte-muse/1.18.4/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/byte-muse/license/docker-compose.yml b/apps/byte-muse/license/docker-compose.yml deleted file mode 100644 index 08bb60ee9..000000000 --- a/apps/byte-muse/license/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - byte-muse-license: - image: envyafish/byte-muse-license:latest - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:5000 diff --git a/apps/byte-muse/license/envs/default.env b/apps/byte-muse/license/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/byte-muse/license/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/byte-muse/license/envs/global.env b/apps/byte-muse/license/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/byte-muse/license/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/byte-muse/license/scripts/init.sh b/apps/byte-muse/license/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/byte-muse/license/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/byte-muse/license/scripts/uninstall.sh b/apps/byte-muse/license/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/byte-muse/license/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/byte-muse/license/scripts/upgrade.sh b/apps/byte-muse/license/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/byte-muse/license/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/casdoor/2.43.0/conf/app.conf b/apps/casdoor/2.43.0/conf/app.conf new file mode 100644 index 000000000..bc4ab524e --- /dev/null +++ b/apps/casdoor/2.43.0/conf/app.conf @@ -0,0 +1,34 @@ +appname = casdoor +httpport = 8000 +runmode = dev +copyrequestbody = true +driverName = mysql +dataSourceName = root:123456@tcp(localhost:3306)/ +dbName = casdoor +tableNamePrefix = +showSql = false +redisEndpoint = +defaultStorageProvider = +isCloudIntranet = false +authState = "casdoor" +socks5Proxy = "127.0.0.1:10808" +verificationCodeTimeout = 10 +initScore = 0 +logPostOnly = true +isUsernameLowered = false +origin = +originFrontend = +staticBaseUrl = "https://cdn.casbin.org" +isDemoMode = false +batchSize = 100 +enableErrorMask = false +enableGzip = true +inactiveTimeoutMinutes = +ldapServerPort = 389 +radiusServerPort = 1812 +radiusSecret = "secret" +quota = {"organization": -1, "user": -1, "application": -1, "provider": -1} +logConfig = {"filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"} +initDataNewOnly = false +initDataFile = "./init_data.json" +frontendBaseDir = "../cc_0" \ No newline at end of file diff --git a/apps/casdoor/2.43.0/config/init_data.json b/apps/casdoor/2.43.0/config/init_data.json deleted file mode 100644 index a08a677fa..000000000 --- a/apps/casdoor/2.43.0/config/init_data.json +++ /dev/null @@ -1,490 +0,0 @@ -{ - "organizations": [ - { - "owner": "", - "name": "", - "displayName": "", - "websiteUrl": "", - "favicon": "", - "passwordType": "plain", - "passwordSalt": "", - "passwordOptions": [ - "AtLeast6" - ], - "countryCodes": [ - "US", - "GB", - "ES", - "FR", - "DE", - "CN", - "JP", - "KR", - "VN", - "ID", - "SG", - "IN", - "IT", - "MY", - "TR", - "DZ", - "IL", - "PH", - "NL", - "PL", - "FI", - "SE", - "UA", - "KZ" - ], - "defaultAvatar": "", - "defaultApplication": "", - "tags": [], - "languages": [ - "en", - "zh", - "es", - "fr", - "de", - "id", - "ja", - "ko", - "ru", - "vi", - "it", - "ms", - "tr", - "ar", - "he", - "nl", - "pl", - "fi", - "sv", - "uk", - "kk", - "fa" - ], - "masterPassword": "", - "defaultPassword": "", - "initScore": 2000, - "enableSoftDeletion": false, - "isProfilePublic": true, - "accountItems": [] - } - ], - "applications": [ - { - "owner": "", - "name": "", - "displayName": "", - "logo": "", - "homepageUrl": "", - "organization": "", - "cert": "", - "enablePassword": true, - "enableSignUp": true, - "clientId": "", - "clientSecret": "", - "providers": [ - { - "name": "", - "canSignUp": true, - "canSignIn": true, - "canUnlink": false, - "prompted": false, - "alertType": "None" - } - ], - "signinMethods": [ - { - "name": "Password", - "displayName": "Password", - "rule": "All" - }, - { - "name": "Verification code", - "displayName": "Verification code", - "rule": "All" - }, - { - "name": "WebAuthn", - "displayName": "WebAuthn", - "rule": "None" - }, - { - "name": "Face ID", - "displayName": "Face ID", - "rule": "None" - } - ], - "signupItems": [ - { - "name": "ID", - "visible": false, - "required": true, - "prompted": false, - "rule": "Random" - }, - { - "name": "Username", - "visible": true, - "required": true, - "prompted": false, - "rule": "None" - }, - { - "name": "Display name", - "visible": true, - "required": true, - "prompted": false, - "rule": "None" - }, - { - "name": "Password", - "visible": true, - "required": true, - "prompted": false, - "rule": "None" - }, - { - "name": "Confirm password", - "visible": true, - "required": true, - "prompted": false, - "rule": "None" - }, - { - "name": "Email", - "visible": true, - "required": true, - "prompted": false, - "rule": "None" - }, - { - "name": "Phone", - "visible": true, - "required": true, - "prompted": false, - "rule": "None" - }, - { - "name": "Agreement", - "visible": true, - "required": true, - "prompted": false, - "rule": "None" - } - ], - "grantTypes": [ - "authorization_code", - "password", - "client_credentials", - "token", - "id_token", - "refresh_token" - ], - "redirectUris": [ - "http://localhost:9000/callback" - ], - "tokenFormat": "JWT", - "tokenFields": [], - "expireInHours": 168, - "failedSigninLimit": 5, - "failedSigninFrozenTime": 15 - } - ], - "users": [ - { - "owner": "", - "name": "", - "type": "normal-user", - "password": "", - "displayName": "", - "avatar": "", - "email": "", - "phone": "", - "countryCode": "", - "address": [], - "affiliation": "", - "tag": "", - "score": 2000, - "ranking": 1, - "isAdmin": true, - "isForbidden": false, - "isDeleted": false, - "signupApplication": "", - "createdIp": "", - "groups": [] - } - ], - "providers": [ - { - "owner": "", - "name": "", - "displayName": "", - "category": "", - "type": "" - } - ], - "certs": [ - { - "owner": "", - "name": "", - "displayName": "", - "scope": "JWT", - "type": "x509", - "cryptoAlgorithm": "RS256", - "bitSize": 4096, - "expireInYears": 20, - "certificate": "", - "privateKey": "" - } - ], - "ldaps": [ - { - "id": "", - "owner": "", - "serverName": "", - "host": "", - "port": 389, - "username": "", - "password": "", - "baseDn": "", - "autoSync": 0, - "lastSync": "" - } - ], - "models": [ - { - "owner": "", - "name": "", - "modelText": "", - "displayName": "" - } - ], - "permissions": [ - { - "actions": [], - "displayName": "", - "effect": "", - "isEnabled": true, - "model": "", - "name": "", - "owner": "", - "resourceType": "", - "resources": [], - "roles": [], - "users": [] - } - ], - "payments": [ - { - "currency": "", - "detail": "", - "displayName": "", - "invoiceRemark": "", - "invoiceTaxId": "", - "invoiceTitle": "", - "invoiceType": "", - "invoiceUrl": "", - "message": "", - "name": "", - "organization": "", - "owner": "", - "payUrl": "", - "personEmail": "", - "personIdCard": "", - "personName": "", - "personPhone": "", - "price": 0, - "productDisplayName": "", - "productName": "", - "provider": "", - "returnUrl": "", - "state": "", - "tag": "", - "type": "", - "user": "" - } - ], - "products": [ - { - "currency": "", - "detail": "", - "displayName": "", - "image": "", - "name": "", - "owner": "", - "price": 0, - "providers": [], - "quantity": 0, - "returnUrl": "", - "sold": 0, - "state": "", - "tag": "" - } - ], - "resources": [ - { - "owner": "", - "name": "", - "user": "", - "provider": "", - "application": "", - "tag": "", - "parent": "", - "fileName": "", - "fileType": "", - "fileFormat": "", - "url": "", - "description": "" - } - ], - "roles": [ - { - "displayName": "", - "isEnabled": true, - "name": "", - "owner": "", - "roles": [], - "users": [] - } - ], - "syncers": [ - { - "affiliationTable": "", - "avatarBaseUrl": "", - "database": "", - "databaseType": "", - "errorText": "", - "host": "", - "isEnabled": false, - "name": "", - "organization": "", - "owner": "", - "password": "", - "port": 0, - "syncInterval": 0, - "table": "", - "tableColumns": [ - { - "casdoorName": "", - "isHashed": true, - "name": "", - "type": "", - "values": [] - } - ], - "tablePrimaryKey": "", - "type": "", - "user": "" - } - ], - "tokens": [ - { - "accessToken": "", - "application": "", - "code": "", - "codeChallenge": "", - "codeExpireIn": 0, - "codeIsUsed": true, - "createdTime": "", - "expiresIn": 0, - "name": "", - "organization": "", - "owner": "", - "refreshToken": "", - "scope": "", - "tokenType": "", - "user": "" - } - ], - "webhooks": [ - { - "contentType": "", - "events": [], - "headers": [ - { - "name": "", - "value": "" - } - ], - "isEnabled": true, - "isUserExtended": true, - "method": "", - "name": "", - "organization": "", - "owner": "", - "url": "" - } - ], - "groups": [ - { - "owner": "", - "name": "", - "displayName": "", - "manager": "", - "contactEmail": "", - "type": "", - "parent_id": "", - "isTopGroup": true, - "title": "", - "key": "", - "children": "", - "isEnabled": true - } - ], - "adapters": [ - { - "owner": "", - "name": "", - "table": "", - "useSameDb": true, - "type": "", - "databaseType": "", - "database": "", - "host": "", - "port": 0, - "user": "", - "password": "" - } - ], - "enforcers": [ - { - "owner": "", - "name": "", - "displayName": "", - "description": "", - "model": "", - "adapter": "", - "enforcer": "" - } - ], - "plans": [ - { - "owner": "", - "name": "", - "displayName": "", - "description": "", - "price": 0, - "currency": "", - "period": "", - "product": "", - "paymentProviders": [], - "isEnabled": true, - "role": "" - } - ], - "pricings": [ - { - "owner": "", - "name": "", - "displayName": "", - "description": "", - "plans": [], - "isEnabled": true, - "trialDuration": 0, - "application": "" - } - ] -} diff --git a/apps/casdoor/2.43.0/data.yml b/apps/casdoor/2.43.0/data.yml index f520206d9..83eb1efcc 100644 --- a/apps/casdoor/2.43.0/data.yml +++ b/apps/casdoor/2.43.0/data.yml @@ -1,138 +1,95 @@ additionalProperties: formFields: + - default: 8000 + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + label: + en: Port + ja: ポート + ms: Port + pt-br: Porta + ru: Порт + ko: 포트 + zh: 端口 + zh-Hant: 埠 - child: default: "" envKey: PANEL_DB_HOST required: true type: service - default: postgresql - edit: true + default: mysql envKey: PANEL_DB_TYPE - labelZh: 数据库 服务 (前置检查) - labelEn: Database Service (Pre-check) + labelEn: Database Service + labelZh: 数据库服务 + label: + en: Database Service + ja: データベース サービス + ms: Perkhidmatan Pangkalan Data + pt-br: Serviço de Banco de Dados + ru: Сервис базы данных + ko: 데이터베이스 서비스 + zh: 数据库服务 + zh-Hant: 數據庫服務 required: true type: apps values: - - label: PostgreSQL - value: postgresql - label: MySQL value: mysql - label: MariaDB value: mariadb - - label: Percona - value: percona - - child: - default: "" - envKey: PANEL_REDIS_SERVICE - required: true - type: service - default: redis - envKey: PANEL_REDIS_TYPE - labelZh: Redis 服务 (前置检查) - labelEn: Redis Service (Pre-check) - required: true - type: apps - values: - - label: Redis - value: redis - - default: "/home/casdoor" - edit: true - envKey: CASDOOR_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 8000 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: postgres - edit: true - envKey: DB_TYPE - labelZh: 数据库 类型 - labelEn: Database Type - required: true - type: select - values: - label: PostgreSQL value: postgres - - label: MySQL (MariaDB, Percona) - value: mysql - - default: "127.0.0.1" - edit: true - envKey: DB_HOSTNAME - labelZh: 数据库 主机地址 - labelEn: Database Host - required: true - type: text - - default: 5432 - edit: true - envKey: DB_PORT - labelZh: 数据库 端口 - labelEn: Database Port - required: true - rule: paramPort - type: number - - default: "casdoor" - edit: true - envKey: DB_USER - labelZh: 数据库 用户名 - labelEn: Database User - required: true - type: text - - default: "" - edit: true - envKey: DB_PASSWD - labelEn: Database Password - labelZh: 数据库 密码 + - default: casdoor + envKey: PANEL_DB_NAME + labelEn: Database + labelZh: 数据库名 + label: + en: Database + ja: データベース + ms: Pangkalan Data + pt-br: Banco de Dados + ru: База данных + ko: 데이터베이스 + zh: 数据库名 + zh-Hant: 數據庫名 + random: true + required: true + rule: paramCommon + type: text + - default: casdoor + envKey: PANEL_DB_USER + labelEn: User + labelZh: 数据库用户 + label: + en: User + ja: ユーザー + ms: Pengguna + pt-br: Usuário + ru: Пользователь + ko: 사용자 + zh: 数据库用户 + zh-Hant: 數據庫用戶 + random: true + required: true + rule: paramCommon + type: text + - default: casdoor + envKey: PANEL_DB_USER_PASSWORD + labelEn: Password + labelZh: 数据库用户密码 + label: + en: Password + ja: パスワード + ms: Kata laluan + pt-br: Senha + ru: Пароль + ko: 비밀번호 + zh: 数据库用户密码 + zh-Hant: 數據庫用戶密碼 random: true required: true - rule: paramComplexity type: password - - default: "casdoor" - edit: true - envKey: DB_NAME - labelZh: 数据库 名称 - labelEn: Database Name - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: REDIS_HOSTNAME - labelZh: Redis 主机 - labelEn: Redis Host - required: true - type: text - - default: 6379 - edit: true - envKey: REDIS_PORT - labelZh: Redis 端口 - labelEn: Redis Port - required: true - rule: paramPort - type: number - - default: 0 - edit: true - envKey: REDIS_DBINDEX - labelZh: Redis 索引 - labelEn: Redis Index - required: true - type: number - - default: "" - edit: true - envKey: REDIS_PASSWORD - labelZh: Redis 密码 - labelEn: Redis Password - required: false - type: password - - default: "" - edit: true - envKey: socks5Proxy - labelZh: Socks5 代理 (地区网络限制) - labelEn: Socks5 Proxy (Region Network Restriction) - required: false - type: text diff --git a/apps/casdoor/2.43.0/docker-compose.yml b/apps/casdoor/2.43.0/docker-compose.yml index a466860a6..4783af535 100644 --- a/apps/casdoor/2.43.0/docker-compose.yml +++ b/apps/casdoor/2.43.0/docker-compose.yml @@ -1,27 +1,21 @@ -networks: - 1panel-network: - external: true - services: casdoor: image: casbin/casdoor:v2.43.0 container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" restart: always networks: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/casdoor/casdoor.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ${CASDOOR_ROOT_PATH}/files:/files environment: - - driverName=${DB_TYPE} - - dbName=${DB_NAME} - - verificationCodeTimeout=10 - - appname=casdoor - - authState=casdoor + RUNNING_IN_DOCKER: "true" + driverName: ${CASDOOR_DRIVER_NAME} + dataSourceName: ${CASDOOR_DATASOURCE_NAME} + dbName: ${PANEL_DB_NAME} + volumes: + - ./conf:/conf + labels: + createdBy: Apps +networks: + 1panel-network: + external: true \ No newline at end of file diff --git a/apps/casdoor/2.43.0/envs/casdoor.env b/apps/casdoor/2.43.0/envs/casdoor.env deleted file mode 100644 index cb7db866a..000000000 --- a/apps/casdoor/2.43.0/envs/casdoor.env +++ /dev/null @@ -1,31 +0,0 @@ -appname=casdoor -httpport=8000 -runmode=prod -copyrequestbody=true -driverName=mysql -dataSourceName= -dbName=casdoor -tableNamePrefix= -showSql=false -redisEndpoint= -defaultStorageProvider= -isCloudIntranet=false -authState=casdoor -socks5Proxy= -verificationCodeTimeout=10 -initScore=0 -logPostOnly=true -isUsernameLowered=false -origin= -originFrontend= -staticBaseUrl=https://cdn.casbin.org -isDemoMode=false -batchSize=100 -enableGzip=true -ldapServerPort=389 -radiusServerPort=1812 -radiusSecret=secret -quota={"organization": -1, "user": -1, "application": -1, "provider": -1} -logConfig={"filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"} -initDataFil="./init_data.json" -frontendBaseDi="../casdoor" diff --git a/apps/casdoor/2.43.0/envs/default.env b/apps/casdoor/2.43.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/casdoor/2.43.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/casdoor/2.43.0/envs/global.env b/apps/casdoor/2.43.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/casdoor/2.43.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/casdoor/2.43.0/scripts/init.sh b/apps/casdoor/2.43.0/scripts/init.sh index cbf317ef5..c40abb0ac 100644 --- a/apps/casdoor/2.43.0/scripts/init.sh +++ b/apps/casdoor/2.43.0/scripts/init.sh @@ -1,33 +1,28 @@ #!/bin/bash -if [ -f .env ]; then - source .env +[ -f ./.env ] && source ./.env - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - sed -i '/^GLOBAL_ENV_FILE=/d' .env - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/casdoor.env" >> .env +# Default configuration +CASDOOR_DRIVER_NAME=${PANEL_DB_TYPE} +CASDOOR_DATASOURCE_NAME="${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@tcp(${PANEL_DB_HOST}:${PANEL_DB_PORT})/" - if [ "$DB_TYPE" == "mysql" ]; then - echo "dataSourceName=$DB_USER:$DB_PASSWD@tcp($DB_HOSTNAME:$DB_PORT)/" >> .env - fi - - if [ "$DB_TYPE" == "postgres" ]; then - echo "dataSourceName=\"user=$DB_USER password=$DB_PASSWD host=$DB_HOSTNAME port=$DB_PORT sslmode=disable dbname=$DB_NAME\"" >> .env - fi - - if [ -n "$REDIS_PASSWORD" ]; then - echo "redisEndpoint=$REDIS_HOSTNAME:$REDIS_PORT,$REDIS_DBINDEX,$REDIS_PASSWORD" >> .env - else - echo "redisEndpoint=$REDIS_HOSTNAME:$REDIS_PORT,$REDIS_DBINDEX" >> .env - fi - - echo "Check Finish." - -else - echo "Error: .env file not found." +# Reset mariadb driver +if [ "$PANEL_DB_TYPE" = "mariadb" ]; then + CASDOOR_DRIVER_NAME="mysql" fi + +# Reset postgresql datasource +if [ "$PANEL_DB_TYPE" = "postgres" ]; then + CASDOOR_DATASOURCE_NAME="user=${PANEL_DB_USER} password=${PANEL_DB_USER_PASSWORD} host=${PANEL_DB_HOST} port=${PANEL_DB_PORT} dbname=${PANEL_DB_NAME} sslmode=disable" +fi + +{ + # Retain the original environment variables + grep -vE '^(CASDOOR_DRIVER_NAME|CASDOOR_DATASOURCE_NAME)' ./.env 2>/dev/null + + # Add CASDOOR_xx environment variables + echo "CASDOOR_DRIVER_NAME=${CASDOOR_DRIVER_NAME}" + echo "CASDOOR_DATASOURCE_NAME=\"${CASDOOR_DATASOURCE_NAME}\"" + echo "" +} > ./.env.tmp && mv ./.env.tmp ./.env + diff --git a/apps/casdoor/2.43.0/scripts/uninstall.sh b/apps/casdoor/2.43.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/casdoor/2.43.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/casdoor/2.43.0/scripts/upgrade.sh b/apps/casdoor/2.43.0/scripts/upgrade.sh index e32cd1c69..f97032249 100644 --- a/apps/casdoor/2.43.0/scripts/upgrade.sh +++ b/apps/casdoor/2.43.0/scripts/upgrade.sh @@ -1,19 +1,5 @@ #!/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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/casdoor.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi +if [ -f ./scripts/init.sh ]; then + ./scripts/init.sh +fi \ No newline at end of file diff --git a/apps/certimate/0.3.26/data.yml b/apps/certimate/0.3.26/data.yml index be4e63f6e..cfd40bc16 100644 --- a/apps/certimate/0.3.26/data.yml +++ b/apps/certimate/0.3.26/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "40297" + - default: 40297 edit: true envKey: PANEL_APP_PORT_HTTP labelEn: Port @@ -15,3 +15,26 @@ additionalProperties: labelZh: 数据路径 required: true type: text + - default: "" + edit: true + envKey: PANEL_HTTP_PROXY + labelEn: HTTP_PROXY (e.g., http://:) + labelZh: HTTP 代理服务器 (例如：http://:) + required: false + rule: paramExtUrl + type: text + - default: "" + edit: true + envKey: PANEL_HTTPS_PROXY + labelEn: HTTPS_PROXY (e.g., http://:) + labelZh: HTTPS 代理服务器 (例如：http://:) + required: false + rule: paramExtUrl + type: text + - default: "" + edit: true + envKey: PANEL_NO_PROXY + labelEn: NO_PROXY (e.g., 172.18.0.0/16,127.0.0.1,localhost) + labelZh: 跳过代理地址 (例如：172.18.0.0/16,127.0.0.1,localhost) + required: false + type: text diff --git a/apps/certimate/0.3.26/docker-compose.yml b/apps/certimate/0.3.26/docker-compose.yml index 7318d08f4..86171b16e 100644 --- a/apps/certimate/0.3.26/docker-compose.yml +++ b/apps/certimate/0.3.26/docker-compose.yml @@ -8,9 +8,15 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:8090" volumes: + - "/etc/localtime:/etc/localtime:ro" + - "/etc/timezone:/etc/timezone:ro" - "${DATA_PATH}:/app/pb_data" labels: createdBy: "Apps" + environment: + - http_proxy=${PANEL_HTTP_PROXY} + - https_proxy=${PANEL_HTTPS_PROXY} + - NO_PROXY=${PANEL_NO_PROXY} networks: 1panel-network: diff --git a/apps/certimate/0.3.26/envs/default.env b/apps/certimate/0.3.26/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/certimate/0.3.26/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/certimate/0.3.26/envs/global.env b/apps/certimate/0.3.26/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/certimate/0.3.26/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/certimate/0.3.26/scripts/init.sh b/apps/certimate/0.3.26/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/certimate/0.3.26/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/certimate/0.3.26/scripts/uninstall.sh b/apps/certimate/0.3.26/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/certimate/0.3.26/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/certimate/0.3.26/scripts/upgrade.sh b/apps/certimate/0.3.26/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/certimate/0.3.26/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/certimate/latest/data.yml b/apps/certimate/latest/data.yml index be4e63f6e..cfd40bc16 100644 --- a/apps/certimate/latest/data.yml +++ b/apps/certimate/latest/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "40297" + - default: 40297 edit: true envKey: PANEL_APP_PORT_HTTP labelEn: Port @@ -15,3 +15,26 @@ additionalProperties: labelZh: 数据路径 required: true type: text + - default: "" + edit: true + envKey: PANEL_HTTP_PROXY + labelEn: HTTP_PROXY (e.g., http://:) + labelZh: HTTP 代理服务器 (例如：http://:) + required: false + rule: paramExtUrl + type: text + - default: "" + edit: true + envKey: PANEL_HTTPS_PROXY + labelEn: HTTPS_PROXY (e.g., http://:) + labelZh: HTTPS 代理服务器 (例如：http://:) + required: false + rule: paramExtUrl + type: text + - default: "" + edit: true + envKey: PANEL_NO_PROXY + labelEn: NO_PROXY (e.g., 172.18.0.0/16,127.0.0.1,localhost) + labelZh: 跳过代理地址 (例如：172.18.0.0/16,127.0.0.1,localhost) + required: false + type: text diff --git a/apps/certimate/latest/docker-compose.yml b/apps/certimate/latest/docker-compose.yml index cd341de6b..958c92c03 100644 --- a/apps/certimate/latest/docker-compose.yml +++ b/apps/certimate/latest/docker-compose.yml @@ -8,9 +8,15 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:8090" volumes: + - "/etc/localtime:/etc/localtime:ro" + - "/etc/timezone:/etc/timezone:ro" - "${DATA_PATH}:/app/pb_data" labels: createdBy: "Apps" + environment: + - http_proxy=${PANEL_HTTP_PROXY} + - https_proxy=${PANEL_HTTPS_PROXY} + - NO_PROXY=${PANEL_NO_PROXY} networks: 1panel-network: diff --git a/apps/cloudsaver/0.6.1/config/env.example b/apps/cloudsaver/0.6.1/config/env.example index 9310e9073..34c31f065 100644 --- a/apps/cloudsaver/0.6.1/config/env.example +++ b/apps/cloudsaver/0.6.1/config/env.example @@ -4,5 +4,3 @@ JWT_SECRET=${JWT_SECRET} # Telegram配置 TELEGRAM_BASE_URL=https://t.me/s -# Telegram频道配置 -TELE_CHANNELS=[] diff --git a/apps/cloudsaver/0.6.1/data.yml b/apps/cloudsaver/0.6.1/data.yml index 9e5474fc4..e93e2200d 100644 --- a/apps/cloudsaver/0.6.1/data.yml +++ b/apps/cloudsaver/0.6.1/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/cloudsaver" + - default: "./data" edit: true envKey: CLOUDSAVER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/cloudsaver/0.6.1/docker-compose.yml b/apps/cloudsaver/0.6.1/docker-compose.yml index 0c3156c4d..864a9a99a 100644 --- a/apps/cloudsaver/0.6.1/docker-compose.yml +++ b/apps/cloudsaver/0.6.1/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8008 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CLOUDSAVER_ROOT_PATH}/data:/app/data - ${CLOUDSAVER_ROOT_PATH}/config:/app/config diff --git a/apps/cloudsaver/0.6.1/envs/default.env b/apps/cloudsaver/0.6.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/cloudsaver/0.6.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/cloudsaver/0.6.1/envs/global.env b/apps/cloudsaver/0.6.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/cloudsaver/0.6.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/cloudsaver/0.6.1/scripts/init.sh b/apps/cloudsaver/0.6.1/scripts/init.sh index 4e2de7a27..c2971fe61 100644 --- a/apps/cloudsaver/0.6.1/scripts/init.sh +++ b/apps/cloudsaver/0.6.1/scripts/init.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 copy env file CONFIG_DIR="$CLOUDSAVER_ROOT_PATH/config" mkdir -p "$CONFIG_DIR" diff --git a/apps/cloudsaver/0.6.1/scripts/uninstall.sh b/apps/cloudsaver/0.6.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/cloudsaver/0.6.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/cloudsaver/0.6.1/scripts/upgrade.sh b/apps/cloudsaver/0.6.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/cloudsaver/0.6.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/cyberchef/10.19.4/docker-compose.yml b/apps/cyberchef/10.19.4/docker-compose.yml index 66c8d24c7..54fced404 100644 --- a/apps/cyberchef/10.19.4/docker-compose.yml +++ b/apps/cyberchef/10.19.4/docker-compose.yml @@ -13,6 +13,3 @@ 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} diff --git a/apps/cyberchef/10.19.4/envs/default.env b/apps/cyberchef/10.19.4/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/cyberchef/10.19.4/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/cyberchef/10.19.4/envs/global.env b/apps/cyberchef/10.19.4/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/cyberchef/10.19.4/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/cyberchef/10.19.4/scripts/init.sh b/apps/cyberchef/10.19.4/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/cyberchef/10.19.4/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/cyberchef/10.19.4/scripts/uninstall.sh b/apps/cyberchef/10.19.4/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/cyberchef/10.19.4/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/cyberchef/10.19.4/scripts/upgrade.sh b/apps/cyberchef/10.19.4/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/cyberchef/10.19.4/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dashdot-gpu/5.9.0/envs/default.env b/apps/dashdot-gpu/5.9.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/dashdot-gpu/5.9.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/dashdot-gpu/5.9.0/envs/global.env b/apps/dashdot-gpu/5.9.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/dashdot-gpu/5.9.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/dashdot-gpu/5.9.0/scripts/init.sh b/apps/dashdot-gpu/5.9.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dashdot-gpu/5.9.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/dashdot-gpu/5.9.0/scripts/uninstall.sh b/apps/dashdot-gpu/5.9.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dashdot-gpu/5.9.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dashdot-gpu/5.9.0/scripts/upgrade.sh b/apps/dashdot-gpu/5.9.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dashdot-gpu/5.9.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dashdot-gpu/5.9.0/data.yml b/apps/dashdot-gpu/nvidia-6.2.0/data.yml similarity index 100% rename from apps/dashdot-gpu/5.9.0/data.yml rename to apps/dashdot-gpu/nvidia-6.2.0/data.yml diff --git a/apps/dashdot-gpu/5.9.0/docker-compose.yml b/apps/dashdot-gpu/nvidia-6.2.0/docker-compose.yml similarity index 84% rename from apps/dashdot-gpu/5.9.0/docker-compose.yml rename to apps/dashdot-gpu/nvidia-6.2.0/docker-compose.yml index ca7e9f7c2..4ce83ae5e 100644 --- a/apps/dashdot-gpu/5.9.0/docker-compose.yml +++ b/apps/dashdot-gpu/nvidia-6.2.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: dashdot: - image: mauricenino/dashdot:nvidia-5.9.0 + image: mauricenino/dashdot:nvidia-6.2.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -30,10 +30,8 @@ services: # - /dev/video11:/dev/video11 ports: - ${PANEL_APP_PORT_HTTP}:3001 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - /:/mnt/host:ro environment: - DASHDOT_WIDGET_LIST=os,cpu,storage,ram,network,gpu + - DASHDOT_ENABLE_CPU_TEMPS=${DASHDOT_ENABLE_CPU_TEMPS} diff --git a/apps/dashdot/sha-6f7544d/.env.sample b/apps/dashdot/6.2.0/.env.sample similarity index 100% rename from apps/dashdot/sha-6f7544d/.env.sample rename to apps/dashdot/6.2.0/.env.sample diff --git a/apps/dashdot/6.2.0/data.yml b/apps/dashdot/6.2.0/data.yml index 0330a7607..d4a1b471a 100644 --- a/apps/dashdot/6.2.0/data.yml +++ b/apps/dashdot/6.2.0/data.yml @@ -1,22 +1,17 @@ additionalProperties: formFields: - - default: 3001 + - default: 40094 edit: true envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port + labelEn: Port + labelZh: 端口 required: true rule: paramPort type: number - - default: "true" + - default: /mnt edit: true - envKey: DASHDOT_ENABLE_CPU_TEMPS - labelZh: 启用 CPU 温度 - labelEn: Enable CPU temps + envKey: DATA_PATH + labelEn: The drive for which you need to view statistics + labelZh: 需要查看统计信息的驱动器 required: true - type: select - values: - - label: 启用 - value: "true" - - label: 禁用 - value: "false" + type: text diff --git a/apps/dashdot/6.2.0/docker-compose.yml b/apps/dashdot/6.2.0/docker-compose.yml index e9917f7fe..e02df892e 100644 --- a/apps/dashdot/6.2.0/docker-compose.yml +++ b/apps/dashdot/6.2.0/docker-compose.yml @@ -1,21 +1,21 @@ -networks: - 1panel-network: - external: true - services: dashdot: - image: mauricenino/dashdot:6.2.0 container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" restart: always networks: - 1panel-network - privileged: true ports: - - ${PANEL_APP_PORT_HTTP}:3001 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - "${PANEL_APP_PORT_HTTP}:3001" volumes: - - /:/mnt/host:ro + - "/etc/os-release:/etc/os-release:ro" + - "/proc/1/ns/net:/mnt/host_ns_net:ro" + - "${DATA_PATH}:/mnt/host:ro" + privileged: true + tty: true + image: mauricenino/dashdot:6.2.0 + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/dashdot/6.2.0/envs/default.env b/apps/dashdot/6.2.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/dashdot/6.2.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/dashdot/6.2.0/envs/global.env b/apps/dashdot/6.2.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/dashdot/6.2.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/dashdot/6.2.0/scripts/init.sh b/apps/dashdot/6.2.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dashdot/6.2.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/dashdot/6.2.0/scripts/uninstall.sh b/apps/dashdot/6.2.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dashdot/6.2.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dashdot/6.2.0/scripts/upgrade.sh b/apps/dashdot/6.2.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dashdot/6.2.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dashdot/sha-6f7544d/data.yml b/apps/dashdot/sha-6f7544d/data.yml deleted file mode 100644 index d4a1b471a..000000000 --- a/apps/dashdot/sha-6f7544d/data.yml +++ /dev/null @@ -1,17 +0,0 @@ -additionalProperties: - formFields: - - default: 40094 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: /mnt - edit: true - envKey: DATA_PATH - labelEn: The drive for which you need to view statistics - labelZh: 需要查看统计信息的驱动器 - required: true - type: text diff --git a/apps/dashdot/sha-6f7544d/docker-compose.yml b/apps/dashdot/sha-6f7544d/docker-compose.yml deleted file mode 100644 index ddf1e3b4b..000000000 --- a/apps/dashdot/sha-6f7544d/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -services: - dashdot: - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:3001" - volumes: - - "/etc/os-release:/etc/os-release:ro" - - "/proc/1/ns/net:/mnt/host_ns_net:ro" - - "${DATA_PATH}:/mnt/host:ro" - privileged: true - tty: true - image: mauricenino/dashdot:sha-6f7544d - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true diff --git a/apps/deeplx/1.0.8.1/data.yml b/apps/deeplx/1.0.8.1/data.yml deleted file mode 100644 index da742d365..000000000 --- a/apps/deeplx/1.0.8.1/data.yml +++ /dev/null @@ -1,39 +0,0 @@ -additionalProperties: - formFields: - - default: 1188 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: API 端口 - labelEn: API Port - required: true - rule: paramPort - type: number - - default: "" - edit: true - envKey: TOKEN - labelZh: 访问令牌以保护您的 API - labelEn: Access Token to protect your API - required: false - type: text - - default: "" - edit: true - envKey: AUTHKEY - labelZh: DeepL官方提供的API Auth Key - labelEn: Official API Auth Key provided by DeepL - required: false - type: text - - default: "" - edit: true - envKey: DL_SESSION - labelZh: DeepL Pro 帐户 dl_session cookie - labelEn: DeepL Pro account dl_session cookie - required: false - type: text - - default: "" - edit: true - envKey: PROXY - labelZh: http代理服务器地址 - labelEn: http proxy server address - required: false - rule: paramExtUrl - type: text diff --git a/apps/deeplx/1.0.8.1/docker-compose.yml b/apps/deeplx/1.0.8.1/docker-compose.yml deleted file mode 100644 index 57ec989ba..000000000 --- a/apps/deeplx/1.0.8.1/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - deeplx: - image: qyg2297248353/deeplx:v1.0.8.1 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:1188 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - PORT=1188 diff --git a/apps/deeplx/1.0.8.1/envs/default.env b/apps/deeplx/1.0.8.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/deeplx/1.0.8.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/deeplx/1.0.8.1/envs/global.env b/apps/deeplx/1.0.8.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/deeplx/1.0.8.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/deeplx/1.0.8.1/scripts/init.sh b/apps/deeplx/1.0.8.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/deeplx/1.0.8.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/deeplx/1.0.8.1/scripts/uninstall.sh b/apps/deeplx/1.0.8.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/deeplx/1.0.8.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/deeplx/1.0.8.1/scripts/upgrade.sh b/apps/deeplx/1.0.8.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/deeplx/1.0.8.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dify/1.8.0/data.yml b/apps/dify/1.8.0/data.yml index 76d89aaf3..9931e48c6 100644 --- a/apps/dify/1.8.0/data.yml +++ b/apps/dify/1.8.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/dify" + - default: "./data" edit: true envKey: DIFY_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/dify/1.8.0/envs/default.env b/apps/dify/1.8.0/envs/default.env deleted file mode 100644 index ddd33010c..000000000 --- a/apps/dify/1.8.0/envs/default.env +++ /dev/null @@ -1 +0,0 @@ -ENV_FILE=.env diff --git a/apps/dify/1.8.0/envs/global.env b/apps/dify/1.8.0/envs/global.env deleted file mode 100644 index 1dcc4aa27..000000000 --- a/apps/dify/1.8.0/envs/global.env +++ /dev/null @@ -1 +0,0 @@ -TZ=Asia/Shanghai \ No newline at end of file diff --git a/apps/dify/1.8.0/scripts/init.sh b/apps/dify/1.8.0/scripts/init.sh index 085059fcc..b0d8ee432 100644 --- a/apps/dify/1.8.0/scripts/init.sh +++ b/apps/dify/1.8.0/scripts/init.sh @@ -3,20 +3,10 @@ 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 "APP_ENV_FILE=${CURRENT_DIR}/envs/dify.env" >> .env - - # setup-2 update dir permissions mkdir -p "$DIFY_ROOT_PATH" cp -r conf/. "$DIFY_ROOT_PATH/" - # setup-3 sync environment variables env_source="envs/dify.env" if [ -f "$env_source" ]; then while IFS='=' read -r key value; do diff --git a/apps/dify/1.8.0/scripts/uninstall.sh b/apps/dify/1.8.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dify/1.8.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dify/1.8.0/scripts/upgrade.sh b/apps/dify/1.8.0/scripts/upgrade.sh index ea92b0638..dc5362a82 100644 --- a/apps/dify/1.8.0/scripts/upgrade.sh +++ b/apps/dify/1.8.0/scripts/upgrade.sh @@ -3,15 +3,6 @@ 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 "APP_ENV_FILE=${CURRENT_DIR}/envs/dify.env" >> .env - - # setup-2 update dir permissions mkdir -p "$DIFY_ROOT_PATH" if [ -d "conf" ]; then @@ -27,7 +18,6 @@ if [ -f .env ]; then echo "Warning: conf directory not found." fi - # setup-3 sync environment variables env_source="envs/dify.env" if [ -f "$env_source" ]; then while IFS='=' read -r key value; do diff --git a/apps/dockge/1.5.0/envs/default.env b/apps/dockge/1.5.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/dockge/1.5.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/dockge/1.5.0/envs/global.env b/apps/dockge/1.5.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/dockge/1.5.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/dockge/1.5.0/scripts/init.sh b/apps/dockge/1.5.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dockge/1.5.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/dockge/1.5.0/scripts/uninstall.sh b/apps/dockge/1.5.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dockge/1.5.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dockge/1.5.0/scripts/upgrade.sh b/apps/dockge/1.5.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dockge/1.5.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dozzle/8.13.10/docker-compose.yml b/apps/dozzle/8.13.10/docker-compose.yml index 592455eec..85e14668d 100644 --- a/apps/dozzle/8.13.10/docker-compose.yml +++ b/apps/dozzle/8.13.10/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} healthcheck: test: [ "CMD", "/dozzle", "healthcheck" ] interval: 3s diff --git a/apps/dozzle/8.13.10/envs/default.env b/apps/dozzle/8.13.10/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/dozzle/8.13.10/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/dozzle/8.13.10/envs/global.env b/apps/dozzle/8.13.10/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/dozzle/8.13.10/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/dozzle/8.13.10/scripts/init.sh b/apps/dozzle/8.13.10/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dozzle/8.13.10/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/dozzle/8.13.10/scripts/uninstall.sh b/apps/dozzle/8.13.10/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dozzle/8.13.10/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dozzle/8.13.10/scripts/upgrade.sh b/apps/dozzle/8.13.10/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dozzle/8.13.10/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dpanel-lite/1.8.1-lite/data.yml b/apps/dpanel-lite/1.8.1-lite/data.yml index cbd353575..87292423a 100644 --- a/apps/dpanel-lite/1.8.1-lite/data.yml +++ b/apps/dpanel-lite/1.8.1-lite/data.yml @@ -1,38 +1,31 @@ additionalProperties: formFields: - - default: "/home/dpanel" - edit: true - envKey: DPANEL_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 8080 + - default: "40283" edit: true envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port + labelEn: Port + labelZh: 端口 required: true rule: paramPort type: number - - default: "admin" + - default: "./data" edit: true - envKey: INSTALL_USERNAME - labelZh: 管理员 用户名 - labelEn: Admin Username + envKey: DATA_PATH + labelEn: Data Path + labelZh: 数据路径 required: true type: text - - default: "admin" + - default: "dpanel" edit: true - envKey: INSTALL_PASSWORD - labelZh: 管理员 密码 - labelEn: Admin Password + envKey: APP_NAME + labelEn: Application Name + labelZh: 应用名称 required: true type: text - - default: "" + - default: "/var/run/docker.sock" edit: true - envKey: HTTP_PROXY - labelZh: 网络代理 - labelEn: Network Proxy - required: false + envKey: DOCKER_SOCK_PATH + labelEn: Docker Socket Path + labelZh: Docker 套接字路径 + required: true type: text diff --git a/apps/dpanel-lite/1.8.1-lite/docker-compose.yml b/apps/dpanel-lite/1.8.1-lite/docker-compose.yml index 19c18ef81..1921bb16b 100644 --- a/apps/dpanel-lite/1.8.1-lite/docker-compose.yml +++ b/apps/dpanel-lite/1.8.1-lite/docker-compose.yml @@ -1,25 +1,20 @@ -networks: - 1panel-network: - external: true - services: dpanel: - image: dpanel/dpanel:1.8.1-lite + image: "dpanel/dpanel:1.8.1-lite" container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" restart: always networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - "${PANEL_APP_PORT_HTTP}:8080" volumes: - - ${DPANEL_ROOT_PATH}/data:/dpanel - - ${DPANEL_ROOT_PATH}/compose:/dpanel/compose - - /var/run/docker.sock:/var/run/docker.sock + - ${DOCKER_SOCK_PATH}:/var/run/docker.sock + - ${DATA_PATH}:/dpanel environment: - - APP_NAME=${CONTAINER_NAME} - - HTTPS_PROXY=${HTTP_PROXY} + - APP_NAME=${APP_NAME} + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/dpanel-lite/1.8.1-lite/envs/default.env b/apps/dpanel-lite/1.8.1-lite/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/dpanel-lite/1.8.1-lite/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/dpanel-lite/1.8.1-lite/envs/global.env b/apps/dpanel-lite/1.8.1-lite/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/dpanel-lite/1.8.1-lite/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/dpanel-lite/1.8.1-lite/scripts/init.sh b/apps/dpanel-lite/1.8.1-lite/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dpanel-lite/1.8.1-lite/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/dpanel-lite/1.8.1-lite/scripts/uninstall.sh b/apps/dpanel-lite/1.8.1-lite/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dpanel-lite/1.8.1-lite/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dpanel-lite/1.8.1-lite/scripts/upgrade.sh b/apps/dpanel-lite/1.8.1-lite/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dpanel-lite/1.8.1-lite/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dpanel/1.8.1/data.yml b/apps/dpanel/1.8.1/data.yml index 7389c1ece..ec0a3c897 100644 --- a/apps/dpanel/1.8.1/data.yml +++ b/apps/dpanel/1.8.1/data.yml @@ -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 diff --git a/apps/dpanel/1.8.1/docker-compose.yml b/apps/dpanel/1.8.1/docker-compose.yml index e4ac07234..9303c06f6 100644 --- a/apps/dpanel/1.8.1/docker-compose.yml +++ b/apps/dpanel/1.8.1/docker-compose.yml @@ -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} diff --git a/apps/dpanel/1.8.1/envs/default.env b/apps/dpanel/1.8.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/dpanel/1.8.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/dpanel/1.8.1/envs/global.env b/apps/dpanel/1.8.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/dpanel/1.8.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/dpanel/1.8.1/scripts/init.sh b/apps/dpanel/1.8.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dpanel/1.8.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/dpanel/1.8.1/scripts/uninstall.sh b/apps/dpanel/1.8.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dpanel/1.8.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dpanel/1.8.1/scripts/upgrade.sh b/apps/dpanel/1.8.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dpanel/1.8.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/dujiaoka/2.1.0/data.yml b/apps/dujiaoka/2.1.0/data.yml index 7e2f2915a..d51bb3c79 100644 --- a/apps/dujiaoka/2.1.0/data.yml +++ b/apps/dujiaoka/2.1.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/dujiaoka" + - default: "./data" edit: true envKey: DUJIAOKA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/dujiaoka/2.1.0/docker-compose.yml b/apps/dujiaoka/2.1.0/docker-compose.yml index 3b91829c4..41a90f7f3 100644 --- a/apps/dujiaoka/2.1.0/docker-compose.yml +++ b/apps/dujiaoka/2.1.0/docker-compose.yml @@ -15,9 +15,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_API}:9000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DUJIAOKA_ROOT_PATH}/app:/app environment: diff --git a/apps/dujiaoka/2.1.0/envs/default.env b/apps/dujiaoka/2.1.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/dujiaoka/2.1.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/dujiaoka/2.1.0/envs/global.env b/apps/dujiaoka/2.1.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/dujiaoka/2.1.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/dujiaoka/2.1.0/scripts/init.sh b/apps/dujiaoka/2.1.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dujiaoka/2.1.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/dujiaoka/2.1.0/scripts/uninstall.sh b/apps/dujiaoka/2.1.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/dujiaoka/2.1.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/dujiaoka/2.1.0/scripts/upgrade.sh b/apps/dujiaoka/2.1.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/dujiaoka/2.1.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/eigenfocus/0.9.0/data.yml b/apps/eigenfocus/0.9.0/data.yml index 453e92414..ae2c88258 100644 --- a/apps/eigenfocus/0.9.0/data.yml +++ b/apps/eigenfocus/0.9.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/eigenfocus" + - default: "./data" edit: true envKey: EIGENFOCUS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/eigenfocus/0.9.0/docker-compose.yml b/apps/eigenfocus/0.9.0/docker-compose.yml index ce85f4790..c214b307d 100644 --- a/apps/eigenfocus/0.9.0/docker-compose.yml +++ b/apps/eigenfocus/0.9.0/docker-compose.yml @@ -13,10 +13,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:3000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${EIGENFOCUS_ROOT_PATH}/data:/eigenfocus-app/app-data + - ${EIGENFOCUS_ROOT_PATH}:/eigenfocus-app/app-data environment: - TZ=Asia/Shanghai + - DEFAULT_HOST_URL=${DEFAULT_HOST_URL} diff --git a/apps/eigenfocus/0.9.0/envs/default.env b/apps/eigenfocus/0.9.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/eigenfocus/0.9.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/eigenfocus/0.9.0/envs/global.env b/apps/eigenfocus/0.9.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/eigenfocus/0.9.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/eigenfocus/0.9.0/scripts/init.sh b/apps/eigenfocus/0.9.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/eigenfocus/0.9.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/eigenfocus/0.9.0/scripts/uninstall.sh b/apps/eigenfocus/0.9.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/eigenfocus/0.9.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/eigenfocus/0.9.0/scripts/upgrade.sh b/apps/eigenfocus/0.9.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/eigenfocus/0.9.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/elastic-elasticsearch/9.1.2/data.yml b/apps/elastic-elasticsearch/9.1.2/data.yml index b627b241e..d125ce856 100644 --- a/apps/elastic-elasticsearch/9.1.2/data.yml +++ b/apps/elastic-elasticsearch/9.1.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/elasticsearch" + - default: "./data" edit: true envKey: ELASTICSEARCH_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/elastic-elasticsearch/9.1.2/docker-compose.yml b/apps/elastic-elasticsearch/9.1.2/docker-compose.yml index 94674185a..be5d50821 100644 --- a/apps/elastic-elasticsearch/9.1.2/docker-compose.yml +++ b/apps/elastic-elasticsearch/9.1.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: elasticsearch: - image: elasticsearch:9.1.2 + image: docker.elastic.co/elasticsearch/elasticsearch:9.1.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -22,9 +22,6 @@ services: ports: - ${PANEL_APP_PORT_HTTPS}:9200 - ${PANEL_APP_PORT_CLUSTER}:9300 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ELASTICSEARCH_ROOT_PATH}/data:/usr/share/elasticsearch/data - ${ELASTICSEARCH_ROOT_PATH}/backup:/usr/share/elasticsearch/backup diff --git a/apps/elastic-elasticsearch/9.1.2/envs/default.env b/apps/elastic-elasticsearch/9.1.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/elastic-elasticsearch/9.1.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/elastic-elasticsearch/9.1.2/envs/global.env b/apps/elastic-elasticsearch/9.1.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/elastic-elasticsearch/9.1.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/elastic-elasticsearch/9.1.2/scripts/init.sh b/apps/elastic-elasticsearch/9.1.2/scripts/init.sh index 33a7b7f49..0a9353e7f 100644 --- a/apps/elastic-elasticsearch/9.1.2/scripts/init.sh +++ b/apps/elastic-elasticsearch/9.1.2/scripts/init.sh @@ -3,13 +3,6 @@ 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 - mkdir -p $ELASTICSEARCH_ROOT_PATH mkdir -p "$ELASTICSEARCH_ROOT_PATH/data" mkdir -p "$ELASTICSEARCH_ROOT_PATH/backup" diff --git a/apps/elastic-elasticsearch/9.1.2/scripts/uninstall.sh b/apps/elastic-elasticsearch/9.1.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/elastic-elasticsearch/9.1.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/elastic-elasticsearch/9.1.2/scripts/upgrade.sh b/apps/elastic-elasticsearch/9.1.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/elastic-elasticsearch/9.1.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/elastic-kibana/9.1.2/data.yml b/apps/elastic-kibana/9.1.2/data.yml index 4a6a5dd1f..beee07edc 100644 --- a/apps/elastic-kibana/9.1.2/data.yml +++ b/apps/elastic-kibana/9.1.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/kibana" + - default: "./data" edit: true envKey: KIBANA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/elastic-kibana/9.1.2/docker-compose.yml b/apps/elastic-kibana/9.1.2/docker-compose.yml index 51f99714e..6e0aad990 100644 --- a/apps/elastic-kibana/9.1.2/docker-compose.yml +++ b/apps/elastic-kibana/9.1.2/docker-compose.yml @@ -13,11 +13,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5601 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${KIBANA_ROOT_PATH}/data:/usr/share/kibana/data + - ${KIBANA_ROOT_PATH}:/usr/share/kibana/data environment: - SERVER_NAME="kibana" - SERVER_HOST="0.0.0.0" diff --git a/apps/elastic-kibana/9.1.2/envs/default.env b/apps/elastic-kibana/9.1.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/elastic-kibana/9.1.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/elastic-kibana/9.1.2/envs/global.env b/apps/elastic-kibana/9.1.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/elastic-kibana/9.1.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/elastic-kibana/9.1.2/scripts/init.sh b/apps/elastic-kibana/9.1.2/scripts/init.sh index f68fbe6d5..7d4cbeb00 100644 --- a/apps/elastic-kibana/9.1.2/scripts/init.sh +++ b/apps/elastic-kibana/9.1.2/scripts/init.sh @@ -3,13 +3,6 @@ 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 - mkdir -p $KIBANA_ROOT_PATH mkdir -p "$KIBANA_ROOT_PATH/data" diff --git a/apps/elastic-kibana/9.1.2/scripts/uninstall.sh b/apps/elastic-kibana/9.1.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/elastic-kibana/9.1.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/elastic-kibana/9.1.2/scripts/upgrade.sh b/apps/elastic-kibana/9.1.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/elastic-kibana/9.1.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/element-web/1.11.110/conf/config.sample.json b/apps/element-web/1.11.110/conf/config.sample.json deleted file mode 100644 index af170bfe5..000000000 --- a/apps/element-web/1.11.110/conf/config.sample.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "default_server_config": { - "m.homeserver": { - "base_url": "https://matrix-client.matrix.org", - "server_name": "matrix.org" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } - }, - "disable_custom_urls": false, - "disable_guests": false, - "disable_login_language_selector": false, - "disable_3pid_login": false, - "force_verification": false, - "brand": "Element", - "integrations_ui_url": "https://scalar.vector.im/", - "integrations_rest_url": "https://scalar.vector.im/api", - "integrations_widgets_urls": [ - "https://scalar.vector.im/_matrix/integrations/v1", - "https://scalar.vector.im/api", - "https://scalar-staging.vector.im/_matrix/integrations/v1", - "https://scalar-staging.vector.im/api", - "https://scalar-staging.riot.im/scalar/api" - ], - "default_widget_container_height": 280, - "default_country_code": "GB", - "show_labs_settings": false, - "features": {}, - "default_federate": true, - "default_theme": "light", - "room_directory": { - "servers": [ - "matrix.org" - ] - }, - "enable_presence_by_hs_url": { - "https://matrix.org": false, - "https://matrix-client.matrix.org": false - }, - "setting_defaults": { - "breadcrumbs": true - }, - "jitsi": { - "preferred_domain": "meet.element.io" - }, - "element_call": { - "url": "https://call.element.io", - "participant_limit": 8, - "brand": "Element Call" - }, - "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" -} diff --git a/apps/element-web/1.11.110/data.yml b/apps/element-web/1.11.110/data.yml index d3807f8af..39d69c828 100644 --- a/apps/element-web/1.11.110/data.yml +++ b/apps/element-web/1.11.110/data.yml @@ -1,5 +1,12 @@ additionalProperties: formFields: + - default: "./data" + edit: true + envKey: ELEMENT_WEB_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text - default: 40124 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/element-web/1.11.110/docker-compose.yml b/apps/element-web/1.11.110/docker-compose.yml index f758e7cdf..c0c81e917 100644 --- a/apps/element-web/1.11.110/docker-compose.yml +++ b/apps/element-web/1.11.110/docker-compose.yml @@ -9,6 +9,8 @@ services: image: vectorim/element-web:v1.11.110 labels: createdBy: "Apps" + volumes: + - ${ELEMENT_WEB_ROOT_PATH}:/app networks: 1panel-network: diff --git a/apps/element-web/1.11.110/envs/default.env b/apps/element-web/1.11.110/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/element-web/1.11.110/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/element-web/1.11.110/envs/global.env b/apps/element-web/1.11.110/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/element-web/1.11.110/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/element-web/1.11.110/scripts/init.sh b/apps/element-web/1.11.110/scripts/init.sh deleted file mode 100644 index 65e20abfc..000000000 --- a/apps/element-web/1.11.110/scripts/init.sh +++ /dev/null @@ -1,29 +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 - - # setup-2 copy config file - mkdir -p "$ELEMENT_WEB_ROOT_PATH" - mkdir -p "$ELEMENT_WEB_ROOT_PATH/config" - cp ./conf/config.sample.json "$ELEMENT_WEB_ROOT_PATH/config/config.json" - - if [ -n "$SYNAPSE_SERVER_NAME" ]; then - cp ./conf/config.sample.json "$ELEMENT_WEB_ROOT_PATH/config/config.$SYNAPSE_SERVER_NAME.json" - fi - - # setup-3 set permission - chmod -R 777 "$ELEMENT_WEB_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/element-web/1.11.110/scripts/uninstall.sh b/apps/element-web/1.11.110/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/element-web/1.11.110/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/element-web/1.11.110/scripts/upgrade.sh b/apps/element-web/1.11.110/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/element-web/1.11.110/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/element-web/latest/data.yml b/apps/element-web/latest/data.yml index d3807f8af..39d69c828 100644 --- a/apps/element-web/latest/data.yml +++ b/apps/element-web/latest/data.yml @@ -1,5 +1,12 @@ additionalProperties: formFields: + - default: "./data" + edit: true + envKey: ELEMENT_WEB_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text - default: 40124 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/element-web/latest/docker-compose.yml b/apps/element-web/latest/docker-compose.yml index 6446849dd..99e696672 100644 --- a/apps/element-web/latest/docker-compose.yml +++ b/apps/element-web/latest/docker-compose.yml @@ -9,6 +9,8 @@ services: image: vectorim/element-web:latest labels: createdBy: "Apps" + volumes: + - ${ELEMENT_WEB_ROOT_PATH}:/app networks: 1panel-network: diff --git a/apps/emby-amilys/4.9.1.19/envs/default.env b/apps/emby-amilys/4.9.1.19/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/emby-amilys/4.9.1.19/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/emby-amilys/4.9.1.19/envs/global.env b/apps/emby-amilys/4.9.1.19/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/emby-amilys/4.9.1.19/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/emby-amilys/4.9.1.19/scripts/init.sh b/apps/emby-amilys/4.9.1.19/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/emby-amilys/4.9.1.19/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/emby-amilys/4.9.1.19/scripts/uninstall.sh b/apps/emby-amilys/4.9.1.19/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/emby-amilys/4.9.1.19/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/emby-amilys/4.9.1.19/scripts/upgrade.sh b/apps/emby-amilys/4.9.1.19/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/emby-amilys/4.9.1.19/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/excalidraw/latest/docker-compose.yml b/apps/excalidraw/latest/docker-compose.yml index a1f8f81eb..9de1b29ea 100644 --- a/apps/excalidraw/latest/docker-compose.yml +++ b/apps/excalidraw/latest/docker-compose.yml @@ -17,8 +17,5 @@ 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} environment: - TZ=Asia/Shanghai diff --git a/apps/excalidraw/latest/envs/default.env b/apps/excalidraw/latest/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/excalidraw/latest/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/excalidraw/latest/envs/global.env b/apps/excalidraw/latest/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/excalidraw/latest/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/excalidraw/latest/scripts/init.sh b/apps/excalidraw/latest/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/excalidraw/latest/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/excalidraw/latest/scripts/uninstall.sh b/apps/excalidraw/latest/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/excalidraw/latest/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/excalidraw/latest/scripts/upgrade.sh b/apps/excalidraw/latest/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/excalidraw/latest/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/feedback/1.0.5/data.yml b/apps/feedback/1.0.5/data.yml index c145a272d..4b3a22d2e 100644 --- a/apps/feedback/1.0.5/data.yml +++ b/apps/feedback/1.0.5/data.yml @@ -19,7 +19,7 @@ additionalProperties: value: mysql - label: Percona value: percona - - default: "/home/feedback" + - default: "./data" edit: true envKey: FEEDBACK_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/feedback/1.0.5/docker-compose.yml b/apps/feedback/1.0.5/docker-compose.yml index 5ed57724f..d5d5e8cfd 100644 --- a/apps/feedback/1.0.5/docker-compose.yml +++ b/apps/feedback/1.0.5/docker-compose.yml @@ -13,10 +13,12 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${FEEDBACK_ROOT_PATH}/data:/app/public/data + - ${FEEDBACK_ROOT_PATH}:/app/public/data environment: + - FEEDBACK_BEI_AN=${FEEDBACK_BEI_AN} + - FEEDBACK_WEBSITE=${FEEDBACK_WEBSITE} - MYSQL_URL=jdbc:mariadb://${DB_HOSTNAME}:${DB_PORT}/${DB_NAME}?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai + - MYSQL_USERNAME=${MYSQL_USERNAME} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - TZ=Asia/Shanghai diff --git a/apps/feedback/1.0.5/envs/default.env b/apps/feedback/1.0.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/feedback/1.0.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/feedback/1.0.5/envs/global.env b/apps/feedback/1.0.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/feedback/1.0.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/feedback/1.0.5/scripts/init.sh b/apps/feedback/1.0.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/feedback/1.0.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/feedback/1.0.5/scripts/uninstall.sh b/apps/feedback/1.0.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/feedback/1.0.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/feedback/1.0.5/scripts/upgrade.sh b/apps/feedback/1.0.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/feedback/1.0.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/feedback/1.0.5/sql/1.0.3.sql b/apps/feedback/1.0.5/sql/1.0.3.sql index a91986dfb..65422b42e 100644 --- a/apps/feedback/1.0.5/sql/1.0.3.sql +++ b/apps/feedback/1.0.5/sql/1.0.3.sql @@ -7,8 +7,7 @@ alter table user_account add plugin_id varchar(32) default '' not null comment '插件ID，只有uTools注册的才有'; alter table user_account -drop -key user_account_auth_method_auth_key_uindex; + drop key user_account_auth_method_auth_key_uindex; alter table update_log add view_count int unsigned default 0 not null comment '浏览数量'; @@ -22,81 +21,81 @@ alter table update_log create table update_log_reply ( - id varchar(32) not null + id varchar(32) not null primary key, - is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', - create_id varchar(32) default '' not null comment '创建人', - create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', - update_id varchar(32) default '' not null comment '更新人', - update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', + is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', + create_id varchar(32) default '' not null comment '创建人', + create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', + update_id varchar(32) default '' not null comment '更新人', + update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', - plugin_id varchar(32) not null default '' comment '插件ID', - update_log_id varchar(32) not null default '' comment '博客ID', + plugin_id varchar(32) not null default '' comment '插件ID', + update_log_id varchar(32) not null default '' comment '博客ID', - content varchar(512) not null default '' comment '回复内容' + content varchar(512) not null default '' comment '回复内容' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_swedish_ci comment '博客评论表'; create table story ( - id varchar(32) not null + id varchar(32) not null primary key, - is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', - create_id varchar(32) default '' not null comment '创建人', - create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', - update_id varchar(32) default '' not null comment '更新人', - update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', + is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', + create_id varchar(32) default '' not null comment '创建人', + create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', + update_id varchar(32) default '' not null comment '更新人', + update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', - plugin_id varchar(32) not null default '' comment '插件ID', - sort int unsigned default 0 not null comment '排序', - title varchar(64) default '' not null comment '标题', - content longtext not null comment '内容', - view_count int unsigned default 0 not null comment '浏览数', - like_count int unsigned default 0 not null comment '喜欢数' + plugin_id varchar(32) not null default '' comment '插件ID', + sort int unsigned default 0 not null comment '排序', + title varchar(64) default '' not null comment '标题', + content longtext not null comment '内容', + view_count int unsigned default 0 not null comment '浏览数', + like_count int unsigned default 0 not null comment '喜欢数' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_swedish_ci comment '我们的故事'; create table faq_group ( - id varchar(32) not null + id varchar(32) not null primary key, - is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', - create_id varchar(32) default '' not null comment '创建人', - create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', - update_id varchar(32) default '' not null comment '更新人', - update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', + is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', + create_id varchar(32) default '' not null comment '创建人', + create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', + update_id varchar(32) default '' not null comment '更新人', + update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', - plugin_id varchar(32) not null default '' comment '插件ID', - title varchar(256) default '' not null comment '分类标题', - sort int unsigned default 0 not null comment '排序' + plugin_id varchar(32) not null default '' comment '插件ID', + title varchar(256) default '' not null comment '分类标题', + sort int unsigned default 0 not null comment '排序' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_swedish_ci comment '常见问题-分类'; create table faq ( - id varchar(32) not null + id varchar(32) not null primary key, - is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', - create_id varchar(32) default '' not null comment '创建人', - create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', - update_id varchar(32) default '' not null comment '更新人', - update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', + is_delete tinyint(1) unsigned default 0 not null comment '逻辑删除', + create_id varchar(32) default '' not null comment '创建人', + create_time datetime default '1970-01-01 00:00:00' not null comment '创建时间', + update_id varchar(32) default '' not null comment '更新人', + update_time datetime default '1970-01-01 00:00:00' not null comment '更新时间', - plugin_id varchar(32) not null default '' comment '插件ID', - group_id varchar(32) default '' not null comment '所属分类', + plugin_id varchar(32) not null default '' comment '插件ID', + group_id varchar(32) default '' not null comment '所属分类', - title varchar(256) default '' not null comment '分类标题', - sort int unsigned default 0 not null comment '排序', + title varchar(256) default '' not null comment '分类标题', + sort int unsigned default 0 not null comment '排序', - view_count int unsigned default 0 not null comment '浏览数', - like_count int unsigned default 0 not null comment '喜欢数', - no_like_count int unsigned default 0 not null comment '不喜欢数量' + view_count int unsigned default 0 not null comment '浏览数', + like_count int unsigned default 0 not null comment '喜欢数', + no_like_count int unsigned default 0 not null comment '不喜欢数量' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_swedish_ci comment '常见问题'; create table faq_content ( - id varchar(32) not null primary key, + id varchar(32) not null primary key, is_delete tinyint(1) unsigned not null default 0 comment '逻辑删除', - content longtext not null comment '内容，Markdown，让前端去渲染' + content longtext not null comment '内容，Markdown，让前端去渲染' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_swedish_ci comment '常见问题内容表'; diff --git a/apps/fider/0.28.1/docker-compose.yml b/apps/fider/0.28.1/docker-compose.yml index 3ee9126ac..1519ffcb9 100644 --- a/apps/fider/0.28.1/docker-compose.yml +++ b/apps/fider/0.28.1/docker-compose.yml @@ -13,8 +13,19 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:3000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME}?sslmode=disable + - BASE_URL=${BASE_URL} + - JWT_SECRET=${JWT_SECRET} + - EMAIL_NOREPLY=${EMAIL_NOREPLY} + - EMAIL_SMTP_HOST=${EMAIL_SMTP_HOST} + - EMAIL_SMTP_PORT=${EMAIL_SMTP_PORT} + - EMAIL_SMTP_USERNAME=${EMAIL_SMTP_USERNAME} + - EMAIL_SMTP_PASSWORD=${EMAIL_SMTP_PASSWORD} + - EMAIL_SMTP_ENABLE_STARTTLS=${EMAIL_SMTP_ENABLE_STARTTLS} + - EMAIL_MAILGUN_API=${EMAIL_MAILGUN_API} + - EMAIL_MAILGUN_DOMAIN=${EMAIL_MAILGUN_DOMAIN} + - EMAIL_MAILGUN_REGION=${EMAIL_MAILGUN_REGION} + - EMAIL_AWSSES_REGION=${EMAIL_AWSSES_REGION} + - EMAIL_AWSSES_ACCESS_KEY_ID=${EMAIL_AWSSES_ACCESS_KEY_ID} + - EMAIL_AWSSES_SECRET_ACCESS_KEY=${EMAIL_AWSSES_SECRET_ACCESS_KEY} diff --git a/apps/fider/0.28.1/envs/default.env b/apps/fider/0.28.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/fider/0.28.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/fider/0.28.1/envs/global.env b/apps/fider/0.28.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/fider/0.28.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/fider/0.28.1/scripts/init.sh b/apps/fider/0.28.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/fider/0.28.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/fider/0.28.1/scripts/uninstall.sh b/apps/fider/0.28.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/fider/0.28.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/fider/0.28.1/scripts/upgrade.sh b/apps/fider/0.28.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/fider/0.28.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/flaresolverr/3.4.0/envs/default.env b/apps/flaresolverr/3.4.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/flaresolverr/3.4.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/flaresolverr/3.4.0/envs/global.env b/apps/flaresolverr/3.4.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/flaresolverr/3.4.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/flaresolverr/3.4.0/scripts/init.sh b/apps/flaresolverr/3.4.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/flaresolverr/3.4.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/flaresolverr/3.4.0/scripts/uninstall.sh b/apps/flaresolverr/3.4.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/flaresolverr/3.4.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/flaresolverr/3.4.0/scripts/upgrade.sh b/apps/flaresolverr/3.4.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/flaresolverr/3.4.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/garage-hq-web/2.0.0/data.yml b/apps/garage-hq-web/2.0.0/data.yml index 73209afda..cd2db94b2 100644 --- a/apps/garage-hq-web/2.0.0/data.yml +++ b/apps/garage-hq-web/2.0.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/garage" + - default: "/data" edit: true envKey: GARAGE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/garage-hq-web/2.0.0/docker-compose.yml b/apps/garage-hq-web/2.0.0/docker-compose.yml index c86642c7d..370a7410a 100644 --- a/apps/garage-hq-web/2.0.0/docker-compose.yml +++ b/apps/garage-hq-web/2.0.0/docker-compose.yml @@ -16,9 +16,6 @@ services: - ${PANEL_APP_PORT_RPC}:3901 - ${PANEL_APP_PORT_S3_WEB}:3902 - ${PANEL_APP_PORT_API}:3903 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GARAGE_ROOT_PATH}/config/garage.toml:/etc/garage.toml - ${GARAGE_ROOT_PATH}/meta:/var/lib/garage/meta diff --git a/apps/garage-hq-web/2.0.0/envs/default.env b/apps/garage-hq-web/2.0.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/garage-hq-web/2.0.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/garage-hq-web/2.0.0/envs/global.env b/apps/garage-hq-web/2.0.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/garage-hq-web/2.0.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/garage-hq-web/2.0.0/scripts/init.sh b/apps/garage-hq-web/2.0.0/scripts/init.sh index 315e05b7a..396624fa9 100644 --- a/apps/garage-hq-web/2.0.0/scripts/init.sh +++ b/apps/garage-hq-web/2.0.0/scripts/init.sh @@ -3,13 +3,6 @@ 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 - # 检查 GARAGE_ROOT_PATH 是否存在 if [ -z "${GARAGE_ROOT_PATH}" ]; then echo "Error: GARAGE_ROOT_PATH is not set in .env." diff --git a/apps/garage-hq-web/2.0.0/scripts/uninstall.sh b/apps/garage-hq-web/2.0.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/garage-hq-web/2.0.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/garage-hq-web/2.0.0/scripts/upgrade.sh b/apps/garage-hq-web/2.0.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/garage-hq-web/2.0.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/garage-hq/2.0.0/data.yml b/apps/garage-hq/2.0.0/data.yml index df9ce99b8..f7cac3683 100644 --- a/apps/garage-hq/2.0.0/data.yml +++ b/apps/garage-hq/2.0.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/garage" + - default: "/data" edit: true envKey: GARAGE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/garage-hq/2.0.0/docker-compose.yml b/apps/garage-hq/2.0.0/docker-compose.yml index e2030bb7a..9a3e7180f 100644 --- a/apps/garage-hq/2.0.0/docker-compose.yml +++ b/apps/garage-hq/2.0.0/docker-compose.yml @@ -16,9 +16,6 @@ services: - ${PANEL_APP_PORT_RPC}:3901 - ${PANEL_APP_PORT_HTTP}:3902 - ${PANEL_APP_PORT_API}:3903 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GARAGE_ROOT_PATH}/config/garage.toml:/etc/garage.toml - ${GARAGE_ROOT_PATH}/meta:/var/lib/garage/meta diff --git a/apps/garage-hq/2.0.0/envs/default.env b/apps/garage-hq/2.0.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/garage-hq/2.0.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/garage-hq/2.0.0/envs/global.env b/apps/garage-hq/2.0.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/garage-hq/2.0.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/garage-hq/2.0.0/scripts/init.sh b/apps/garage-hq/2.0.0/scripts/init.sh index 88bb39b37..7c0501c01 100644 --- a/apps/garage-hq/2.0.0/scripts/init.sh +++ b/apps/garage-hq/2.0.0/scripts/init.sh @@ -3,13 +3,6 @@ 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 - # 检查 GARAGE_ROOT_PATH 是否存在 if [ -z "${GARAGE_ROOT_PATH}" ]; then echo "Error: GARAGE_ROOT_PATH is not set in .env." diff --git a/apps/garage-hq/2.0.0/scripts/uninstall.sh b/apps/garage-hq/2.0.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/garage-hq/2.0.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/garage-hq/2.0.0/scripts/upgrade.sh b/apps/garage-hq/2.0.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/garage-hq/2.0.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/ghost/6.0.5/data.yml b/apps/ghost/6.0.5/data.yml index 507f9f63d..0336f649f 100644 --- a/apps/ghost/6.0.5/data.yml +++ b/apps/ghost/6.0.5/data.yml @@ -19,7 +19,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/ghost" + - default: "./data" edit: true envKey: GHOST_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/ghost/6.0.5/docker-compose.yml b/apps/ghost/6.0.5/docker-compose.yml index d33c36186..c26b12c2e 100644 --- a/apps/ghost/6.0.5/docker-compose.yml +++ b/apps/ghost/6.0.5/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:2368 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GHOST_ROOT_PATH}/data:/var/lib/ghost/content environment: @@ -25,3 +22,9 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true + - url=${url} + - admin__url=${admin__url} + - database__connection__host=${database__connection__host} + - database__connection__user=${database__connection__user} + - database__connection__password=${database__connection__password} + - database__connection__database=${database__connection__database} diff --git a/apps/ghost/6.0.5/envs/default.env b/apps/ghost/6.0.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ghost/6.0.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ghost/6.0.5/envs/global.env b/apps/ghost/6.0.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ghost/6.0.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ghost/6.0.5/scripts/init.sh b/apps/ghost/6.0.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ghost/6.0.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/ghost/6.0.5/scripts/uninstall.sh b/apps/ghost/6.0.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ghost/6.0.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ghost/6.0.5/scripts/upgrade.sh b/apps/ghost/6.0.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ghost/6.0.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/gitea-runner/0.2.13/data.yml b/apps/gitea-runner/0.2.13/data.yml index 5beea6482..757dfa4eb 100644 --- a/apps/gitea-runner/0.2.13/data.yml +++ b/apps/gitea-runner/0.2.13/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/gitea" + - default: "./data" edit: true envKey: GITEA_RUNNER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/gitea-runner/0.2.13/docker-compose.yml b/apps/gitea-runner/0.2.13/docker-compose.yml index da4fae155..94b067925 100644 --- a/apps/gitea-runner/0.2.13/docker-compose.yml +++ b/apps/gitea-runner/0.2.13/docker-compose.yml @@ -12,11 +12,14 @@ services: networks: - 1panel-network privileged: true - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: + - ${GITEA_RUNNER_ROOT_PATH}/config.yaml:/config.yaml - ${GITEA_RUNNER_ROOT_PATH}/data:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock + environment: + GITEA_INSTANCE_URL: "${GITEA_INSTANCE_URL}" + GITEA_RUNNER_REGISTRATION_TOKEN: "${GITEA_RUNNER_REGISTRATION_TOKEN}" + GITEA_RUNNER_NAME: "${GITEA_RUNNER_NAME}" + GITEA_RUNNER_LABELS: "${GITEA_RUNNER_LABELS}" diff --git a/apps/gitea-runner/0.2.13/envs/default.env b/apps/gitea-runner/0.2.13/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/gitea-runner/0.2.13/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/gitea-runner/0.2.13/envs/global.env b/apps/gitea-runner/0.2.13/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/gitea-runner/0.2.13/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/gitea-runner/0.2.13/scripts/init.sh b/apps/gitea-runner/0.2.13/scripts/init.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/gitea-runner/0.2.13/scripts/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/gitea-runner/0.2.13/scripts/uninstall.sh b/apps/gitea-runner/0.2.13/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/gitea-runner/0.2.13/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/gitea-runner/0.2.13/scripts/upgrade.sh b/apps/gitea-runner/0.2.13/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/gitea-runner/0.2.13/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/gitea/1.24.5/data.yml b/apps/gitea/1.24.5/data.yml index 447f89da6..1dcf9df60 100644 --- a/apps/gitea/1.24.5/data.yml +++ b/apps/gitea/1.24.5/data.yml @@ -21,7 +21,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/gitea" + - default: "./data" edit: true envKey: GITEA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/gitea/1.24.5/docker-compose.yml b/apps/gitea/1.24.5/docker-compose.yml index 76d5f24fa..64d70e014 100644 --- a/apps/gitea/1.24.5/docker-compose.yml +++ b/apps/gitea/1.24.5/docker-compose.yml @@ -15,9 +15,7 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_SSH}:22 env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/gitea/gitea.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - ./envs/gitea.env volumes: - ${GITEA_ROOT_PATH}/data:/data - /etc/timezone:/etc/timezone:ro diff --git a/apps/gitea/1.24.5/envs/default.env b/apps/gitea/1.24.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/gitea/1.24.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/gitea/1.24.5/envs/global.env b/apps/gitea/1.24.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/gitea/1.24.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/gitea/1.24.5/scripts/init.sh b/apps/gitea/1.24.5/scripts/init.sh deleted file mode 100644 index 636a62139..000000000 --- a/apps/gitea/1.24.5/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/gitea.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/gitea/1.24.5/scripts/uninstall.sh b/apps/gitea/1.24.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/gitea/1.24.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/gitea/1.24.5/scripts/upgrade.sh b/apps/gitea/1.24.5/scripts/upgrade.sh deleted file mode 100644 index 636a62139..000000000 --- a/apps/gitea/1.24.5/scripts/upgrade.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/gitea.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/glance/0.8.4/conf/glance.yml b/apps/glance/0.8.4/conf/glance.yml deleted file mode 100644 index 6417cdda3..000000000 --- a/apps/glance/0.8.4/conf/glance.yml +++ /dev/null @@ -1,68 +0,0 @@ -server: - port: 8080 - assets-path: /app/assets -pages: - - name: Home - columns: - - size: small - widgets: - - type: calendar - - - type: rss - limit: 10 - collapse-after: 3 - cache: 3h - feeds: - - url: https://ciechanow.ski/atom.xml - - url: https://www.joshwcomeau.com/rss.xml - title: Josh Comeau - - url: https://samwho.dev/rss.xml - - url: https://awesomekling.github.io/feed.xml - - url: https://ishadeed.com/feed.xml - title: Ahmad Shadeed - - - type: twitch-channels - channels: - - theprimeagen - - cohhcarnage - - christitustech - - blurbs - - asmongold - - jembawls - - - size: full - widgets: - - type: hacker-news - - - type: videos - channels: - - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling - - UCv6J_jJa8GJqFwQNgNrMuww # ServeTheHome - - UCOk-gHyjcWZNj3Br4oxwh0A # Techno Tim - - - type: reddit - subreddit: selfhosted - - - size: small - widgets: - - type: weather - location: London, United Kingdom - - - type: markets - markets: - - symbol: SPY - name: S&P 500 - - symbol: BTC-USD - name: Bitcoin - - symbol: NVDA - name: NVIDIA - - symbol: AAPL - name: Apple - - symbol: MSFT - name: Microsoft - - symbol: GOOGL - name: Google - - symbol: AMD - name: AMD - - symbol: RDDT - name: Reddit diff --git a/apps/glance/0.8.4/data/glance.yml b/apps/glance/0.8.4/data/glance.yml deleted file mode 100644 index 7cde96e97..000000000 --- a/apps/glance/0.8.4/data/glance.yml +++ /dev/null @@ -1,106 +0,0 @@ -theme: - background-color: 225 14 15 - primary-color: 157 47 65 - contrast-multiplier: 1.1 - -pages: - - name: Home - columns: - - size: small - widgets: - - type: clock - hour-format: 24h - timezones: - - timezone: Etc/UTC - label: MapleStory Game Time - - timezone: Asia/Shanghai - label: Shanghai - - timezone: America/New_York - label: New York - - - type: calendar - - - type: twitch-channels - channels: - - theprimeagen - - cohhcarnage - - christitustech - - blurbs - - asmongold - - jembawls - - - size: full - widgets: - - type: hacker-news - - - type: rss - limit: 10 - collapse-after: 3 - cache: 3h - style: detailed-list - feeds: - - url: https://supertechfans.com/cn/index.xml - title: HackerNews - - - type: videos - channels: - - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling - - UCv6J_jJa8GJqFwQNgNrMuww # ServeTheHome - - UCOk-gHyjcWZNj3Br4oxwh0A # Techno Tim - limit: 25 - collapse-after-rows: 2 - style: grid-cards - - - type: reddit - subreddit: selfhosted - - - size: small - widgets: - - type: weather - location: Beijing, China - - - type: bookmarks - groups: - - links: - - title: Google - url: https://google.com/ - - title: Github - url: https://github.com/ - - title: Hostloc - url: https://hostloc.com/ - - title: Nodeseek - url: https://www.nodeseek.com/ - - title: Linuxdo - url: https://linux.do/ - - title: V2ex - url: https://www.v2ex.com/ - - title: Entertainment - color: 10 70 50 - links: - - title: Bilibli - url: https://www.bilibili.com/ - - title: YouTube - url: https://www.youtube.com/ - - title: Netflix - url: https://www.netflix.com/ - - title: Disney+ - url: https://www.disneyplus.com/ - - - type: markets - markets: - - symbol: SPY - name: S&P 500 - - symbol: BTC-USD - name: Bitcoin - - symbol: NVDA - name: NVIDIA - - symbol: AAPL - name: Apple - - symbol: MSFT - name: Microsoft - - symbol: GOOGL - name: Google - - symbol: AMD - name: AMD - - symbol: RDDT - name: Reddit \ No newline at end of file diff --git a/apps/glance/0.8.4/envs/default.env b/apps/glance/0.8.4/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/glance/0.8.4/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/glance/0.8.4/envs/global.env b/apps/glance/0.8.4/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/glance/0.8.4/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/glance/0.8.4/scripts/init.sh b/apps/glance/0.8.4/scripts/init.sh deleted file mode 100644 index ecfa16a43..000000000 --- a/apps/glance/0.8.4/scripts/init.sh +++ /dev/null @@ -1,22 +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 - - mkdir -p "$GLANCE_ROOT_PATH" - mkdir -p "$GLANCE_ROOT_PATH/app" - - cp ./conf/glance.yml "$GLANCE_ROOT_PATH/app/glance.yml" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/glance/0.8.4/scripts/uninstall.sh b/apps/glance/0.8.4/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/glance/0.8.4/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/glance/0.8.4/scripts/upgrade.sh b/apps/glance/0.8.4/scripts/upgrade.sh deleted file mode 100644 index fda819a40..000000000 --- a/apps/glance/0.8.4/scripts/upgrade.sh +++ /dev/null @@ -1,24 +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 - - mkdir -p "$GLANCE_ROOT_PATH" - mkdir -p "$GLANCE_ROOT_PATH/app" - - if [ ! -f "$GLANCE_ROOT_PATH/app/glance.yml" ]; then - cp ./conf/glance.yml "$GLANCE_ROOT_PATH/app/glance.yml" - fi - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/halo-h2/2.21.7/data.yml b/apps/halo-h2/2.21.7/data.yml index 72848caad..9ee7b37bc 100644 --- a/apps/halo-h2/2.21.7/data.yml +++ b/apps/halo-h2/2.21.7/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/halo" + - default: "./data" edit: true envKey: HALO_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/halo-h2/2.21.7/envs/default.env b/apps/halo-h2/2.21.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/halo-h2/2.21.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/halo-h2/2.21.7/envs/global.env b/apps/halo-h2/2.21.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/halo-h2/2.21.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/halo-h2/2.21.7/scripts/init.sh b/apps/halo-h2/2.21.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/halo-h2/2.21.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/halo-h2/2.21.7/scripts/uninstall.sh b/apps/halo-h2/2.21.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/halo-h2/2.21.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/halo-h2/2.21.7/scripts/upgrade.sh b/apps/halo-h2/2.21.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/halo-h2/2.21.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/halo/2.21.7/data.yml b/apps/halo/2.21.7/data.yml index 48935be5b..28e4d54ce 100644 --- a/apps/halo/2.21.7/data.yml +++ b/apps/halo/2.21.7/data.yml @@ -20,7 +20,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/halo" + - default: "./data" edit: true envKey: HALO_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/halo/2.21.7/envs/default.env b/apps/halo/2.21.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/halo/2.21.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/halo/2.21.7/envs/global.env b/apps/halo/2.21.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/halo/2.21.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/halo/2.21.7/scripts/init.sh b/apps/halo/2.21.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/halo/2.21.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/halo/2.21.7/scripts/uninstall.sh b/apps/halo/2.21.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/halo/2.21.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/halo/2.21.7/scripts/upgrade.sh b/apps/halo/2.21.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/halo/2.21.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/homarr/0.16.0/data.yml b/apps/homarr/0.16.0/data.yml index f0f6d4264..c25000094 100644 --- a/apps/homarr/0.16.0/data.yml +++ b/apps/homarr/0.16.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/homarr" + - default: "./data" edit: true envKey: HOMARR_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/homarr/0.16.0/docker-compose.yml b/apps/homarr/0.16.0/docker-compose.yml index eda21f105..3f4084391 100644 --- a/apps/homarr/0.16.0/docker-compose.yml +++ b/apps/homarr/0.16.0/docker-compose.yml @@ -9,12 +9,10 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:7575 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - /var/run/docker.sock:/var/run/docker.sock - ${HOMARR_ROOT_PATH}/configs:/app/data/configs diff --git a/apps/homarr/0.16.0/envs/default.env b/apps/homarr/0.16.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/homarr/0.16.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/homarr/0.16.0/envs/global.env b/apps/homarr/0.16.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/homarr/0.16.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/homarr/0.16.0/scripts/init.sh b/apps/homarr/0.16.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/homarr/0.16.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/homarr/0.16.0/scripts/uninstall.sh b/apps/homarr/0.16.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/homarr/0.16.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/homarr/0.16.0/scripts/upgrade.sh b/apps/homarr/0.16.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/homarr/0.16.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/iframely/2.4.3/docker-compose.yml b/apps/iframely/2.4.3/docker-compose.yml index 520e6c521..3eb804688 100644 --- a/apps/iframely/2.4.3/docker-compose.yml +++ b/apps/iframely/2.4.3/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8061 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ./config/config.local.js:/iframely/config.local.js environment: diff --git a/apps/iframely/2.4.3/envs/default.env b/apps/iframely/2.4.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/iframely/2.4.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/iframely/2.4.3/envs/global.env b/apps/iframely/2.4.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/iframely/2.4.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/iframely/2.4.3/scripts/init.sh b/apps/iframely/2.4.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/iframely/2.4.3/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/iframely/2.4.3/scripts/uninstall.sh b/apps/iframely/2.4.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iframely/2.4.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/iframely/2.4.3/scripts/upgrade.sh b/apps/iframely/2.4.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/iframely/2.4.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/ikaros-Suwmlee/2.6.1/.env.sample b/apps/ikaros-Suwmlee/2.6.1/.env.sample new file mode 100644 index 000000000..91f6dc07b --- /dev/null +++ b/apps/ikaros-Suwmlee/2.6.1/.env.sample @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +IKAROS_ROOT_PATH=/home/ikaros + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=12346 + diff --git a/apps/ikaros/2.6.1/data.yml b/apps/ikaros-Suwmlee/2.6.1/data.yml similarity index 92% rename from apps/ikaros/2.6.1/data.yml rename to apps/ikaros-Suwmlee/2.6.1/data.yml index 70f75d0bf..ba9cd6b20 100644 --- a/apps/ikaros/2.6.1/data.yml +++ b/apps/ikaros-Suwmlee/2.6.1/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/ikaros" + - default: "./data" edit: true envKey: IKAROS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/ikaros/2.6.1/docker-compose.yml b/apps/ikaros-Suwmlee/2.6.1/docker-compose.yml similarity index 74% rename from apps/ikaros/2.6.1/docker-compose.yml rename to apps/ikaros-Suwmlee/2.6.1/docker-compose.yml index 331e8c89c..ea243970f 100644 --- a/apps/ikaros/2.6.1/docker-compose.yml +++ b/apps/ikaros-Suwmlee/2.6.1/docker-compose.yml @@ -13,13 +13,10 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:12346 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IKAROS_ROOT_PATH}/media:/media - ${IKAROS_ROOT_PATH}/data:/app/data environment: - PUID=0 - PGID=0 - - TZ=Asia/Shanghai + - TZ=Asia/Shanghai \ No newline at end of file diff --git a/apps/ikaros-Suwmlee/README.md b/apps/ikaros-Suwmlee/README.md new file mode 100644 index 000000000..7fab61c95 --- /dev/null +++ b/apps/ikaros-Suwmlee/README.md @@ -0,0 +1,19 @@ +# ikaros + +打通下载软件与媒体服务，安心享受影片 + +![ikaros](https://file.lifebus.top/imgs/ikaros_cover.png) + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +## 简介 + ++ 批量软/硬链接 ++ 批量修改文件名，优化剧集名及自定义 ++ JAV刮削及自定义 ++ 自动清理关联的软/硬链接及种子文件 ++ 托管（忘记这款软件，安心看片） + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/ikaros-Suwmlee/data.yml b/apps/ikaros-Suwmlee/data.yml new file mode 100644 index 000000000..c249cb806 --- /dev/null +++ b/apps/ikaros-Suwmlee/data.yml @@ -0,0 +1,14 @@ +additionalProperties: + key: ikaros + name: ikaros + tags: + - WebSite + - Local + shortDescZh: 打通下载软件与媒体服务，安心享受影片 + shortDescEn: Connect download software and media services, enjoy movies with peace of mind + type: website + crossVersionUpdate: true + limit: 0 + website: https://github.com/Suwmlee/ikaros/ + github: https://github.com/Suwmlee/ikaros/ + document: https://github.com/Suwmlee/ikaros/ diff --git a/apps/ikaros-Suwmlee/logo.png b/apps/ikaros-Suwmlee/logo.png new file mode 100644 index 000000000..2512e2b9c Binary files /dev/null and b/apps/ikaros-Suwmlee/logo.png differ diff --git a/apps/ikaros/2.6.1/envs/default.env b/apps/ikaros/2.6.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ikaros/2.6.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ikaros/2.6.1/envs/global.env b/apps/ikaros/2.6.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ikaros/2.6.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ikaros/2.6.1/scripts/init.sh b/apps/ikaros/2.6.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ikaros/2.6.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/ikaros/2.6.1/scripts/uninstall.sh b/apps/ikaros/2.6.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ikaros/2.6.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ikaros/2.6.1/scripts/upgrade.sh b/apps/ikaros/2.6.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ikaros/2.6.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/immich-machine-learning/1.140.0/data.yml b/apps/immich-machine-learning/1.140.0/data.yml index 7321cde6d..e5850a9bb 100644 --- a/apps/immich-machine-learning/1.140.0/data.yml +++ b/apps/immich-machine-learning/1.140.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/immich-machine-learning" + - default: "./data" edit: true envKey: IMMICH_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/immich-machine-learning/1.140.0/docker-compose.yml b/apps/immich-machine-learning/1.140.0/docker-compose.yml index 484edec9f..109e93713 100644 --- a/apps/immich-machine-learning/1.140.0/docker-compose.yml +++ b/apps/immich-machine-learning/1.140.0/docker-compose.yml @@ -24,8 +24,5 @@ services: # - /dev/video11:/dev/video11 ports: - ${PANEL_APP_PORT_HTTP}:3003 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache diff --git a/apps/immich-machine-learning/1.140.0/envs/default.env b/apps/immich-machine-learning/1.140.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/immich-machine-learning/1.140.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/immich-machine-learning/1.140.0/envs/global.env b/apps/immich-machine-learning/1.140.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/immich-machine-learning/1.140.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/immich-machine-learning/1.140.0/scripts/init.sh b/apps/immich-machine-learning/1.140.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich-machine-learning/1.140.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/immich-machine-learning/1.140.0/scripts/uninstall.sh b/apps/immich-machine-learning/1.140.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/immich-machine-learning/1.140.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/immich-machine-learning/1.140.0/scripts/upgrade.sh b/apps/immich-machine-learning/1.140.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich-machine-learning/1.140.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/immich-no-machine/1.140.0/data.yml b/apps/immich-no-machine/1.140.0/data.yml index 093e32b15..a53e80d04 100644 --- a/apps/immich-no-machine/1.140.0/data.yml +++ b/apps/immich-no-machine/1.140.0/data.yml @@ -14,7 +14,7 @@ additionalProperties: values: - label: Redis value: redis - - default: "/home/immich-app" + - default: "./data" edit: true envKey: IMMICH_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/immich-no-machine/1.140.0/docker-compose.yml b/apps/immich-no-machine/1.140.0/docker-compose.yml index b21253f68..9d457719c 100644 --- a/apps/immich-no-machine/1.140.0/docker-compose.yml +++ b/apps/immich-no-machine/1.140.0/docker-compose.yml @@ -26,9 +26,6 @@ services: # - /dev/video11:/dev/video11 ports: - ${PANEL_APP_PORT_HTTP}:2283 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - /etc/localtime:/etc/localtime diff --git a/apps/immich-no-machine/1.140.0/envs/default.env b/apps/immich-no-machine/1.140.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/immich-no-machine/1.140.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/immich-no-machine/1.140.0/envs/global.env b/apps/immich-no-machine/1.140.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/immich-no-machine/1.140.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/immich-no-machine/1.140.0/scripts/init.sh b/apps/immich-no-machine/1.140.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich-no-machine/1.140.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/immich-no-machine/1.140.0/scripts/uninstall.sh b/apps/immich-no-machine/1.140.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/immich-no-machine/1.140.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/immich-no-machine/1.140.0/scripts/upgrade.sh b/apps/immich-no-machine/1.140.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich-no-machine/1.140.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/immich-server/1.140.0/data.yml b/apps/immich-server/1.140.0/data.yml index 33b62351b..984b81bdc 100644 --- a/apps/immich-server/1.140.0/data.yml +++ b/apps/immich-server/1.140.0/data.yml @@ -28,7 +28,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/immich-app" + - default: "./data" edit: true envKey: IMMICH_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/immich-server/1.140.0/docker-compose.yml b/apps/immich-server/1.140.0/docker-compose.yml index e1ee97547..b66b5b900 100644 --- a/apps/immich-server/1.140.0/docker-compose.yml +++ b/apps/immich-server/1.140.0/docker-compose.yml @@ -24,9 +24,6 @@ services: # - /dev/video11:/dev/video11 ports: - ${PANEL_APP_PORT_HTTP}:2283 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - /etc/localtime:/etc/localtime diff --git a/apps/immich-server/1.140.0/envs/default.env b/apps/immich-server/1.140.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/immich-server/1.140.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/immich-server/1.140.0/envs/global.env b/apps/immich-server/1.140.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/immich-server/1.140.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/immich-server/1.140.0/scripts/init.sh b/apps/immich-server/1.140.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich-server/1.140.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/immich-server/1.140.0/scripts/uninstall.sh b/apps/immich-server/1.140.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/immich-server/1.140.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/immich-server/1.140.0/scripts/upgrade.sh b/apps/immich-server/1.140.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich-server/1.140.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/immich/1.140.0/envs/default.env b/apps/immich/1.140.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/immich/1.140.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/immich/1.140.0/envs/global.env b/apps/immich/1.140.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/immich/1.140.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/immich/1.140.0/scripts/init.sh b/apps/immich/1.140.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich/1.140.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/immich/1.140.0/scripts/uninstall.sh b/apps/immich/1.140.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/immich/1.140.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/immich/1.140.0/scripts/upgrade.sh b/apps/immich/1.140.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/immich/1.140.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/iycms/3.3.44/data.yml b/apps/iycms/3.3.44/data.yml index 245e890e2..3eb35853e 100644 --- a/apps/iycms/3.3.44/data.yml +++ b/apps/iycms/3.3.44/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/iycms" + - default: "./data" edit: true envKey: IYCMS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/iycms/3.3.44/docker-compose.yml b/apps/iycms/3.3.44/docker-compose.yml index 007b04d12..70b53d3da 100644 --- a/apps/iycms/3.3.44/docker-compose.yml +++ b/apps/iycms/3.3.44/docker-compose.yml @@ -14,8 +14,5 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_ADMIN}:21007 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IYCMS_ROOT_PATH}/iycms:/app/iycms diff --git a/apps/iycms/3.3.44/envs/default.env b/apps/iycms/3.3.44/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/iycms/3.3.44/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/iycms/3.3.44/envs/global.env b/apps/iycms/3.3.44/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/iycms/3.3.44/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/iycms/3.3.44/scripts/init.sh b/apps/iycms/3.3.44/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/iycms/3.3.44/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/iycms/3.3.44/scripts/uninstall.sh b/apps/iycms/3.3.44/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iycms/3.3.44/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/iycms/3.3.44/scripts/upgrade.sh b/apps/iycms/3.3.44/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/iycms/3.3.44/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/iyuu-plus/latest-mysql/data.yml b/apps/iyuu-plus/latest-mysql/data.yml index 923f53b80..9df847fbe 100644 --- a/apps/iyuu-plus/latest-mysql/data.yml +++ b/apps/iyuu-plus/latest-mysql/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/iyuuplus" + - default: "./data" edit: true envKey: IYUUCN_ROOT_PATH labelZh: 数据持久化路径 @@ -31,24 +31,3 @@ additionalProperties: required: false rule: paramPort type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/iyuu-plus/latest-mysql/docker-compose.yml b/apps/iyuu-plus/latest-mysql/docker-compose.yml index 22c67216b..4b961a584 100644 --- a/apps/iyuu-plus/latest-mysql/docker-compose.yml +++ b/apps/iyuu-plus/latest-mysql/docker-compose.yml @@ -20,6 +20,3 @@ services: - ${IYUUCN_ROOT_PATH}/data:/data - ${IYUUCN_ROOT_PATH}/qBittorrent:/qBittorrent - ${IYUUCN_ROOT_PATH}/transmission:/transmission - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/apps/iyuu-plus/latest-mysql/envs/default.env b/apps/iyuu-plus/latest-mysql/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/iyuu-plus/latest-mysql/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/iyuu-plus/latest-mysql/envs/global.env b/apps/iyuu-plus/latest-mysql/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/iyuu-plus/latest-mysql/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/iyuu-plus/latest-mysql/scripts/init.sh b/apps/iyuu-plus/latest-mysql/scripts/init.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iyuu-plus/latest-mysql/scripts/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/iyuu-plus/latest-mysql/scripts/uninstall.sh b/apps/iyuu-plus/latest-mysql/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iyuu-plus/latest-mysql/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/iyuu-plus/latest-mysql/scripts/upgrade.sh b/apps/iyuu-plus/latest-mysql/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iyuu-plus/latest-mysql/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/iyuu-plus/latest/data.yml b/apps/iyuu-plus/latest/data.yml index 923f53b80..9df847fbe 100644 --- a/apps/iyuu-plus/latest/data.yml +++ b/apps/iyuu-plus/latest/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/iyuuplus" + - default: "./data" edit: true envKey: IYUUCN_ROOT_PATH labelZh: 数据持久化路径 @@ -31,24 +31,3 @@ additionalProperties: required: false rule: paramPort type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/iyuu-plus/latest/docker-compose.yml b/apps/iyuu-plus/latest/docker-compose.yml index 9541eec9d..874f9a435 100644 --- a/apps/iyuu-plus/latest/docker-compose.yml +++ b/apps/iyuu-plus/latest/docker-compose.yml @@ -20,6 +20,3 @@ services: - ${IYUUCN_ROOT_PATH}/data:/data - ${IYUUCN_ROOT_PATH}/qBittorrent:/qBittorrent - ${IYUUCN_ROOT_PATH}/transmission:/transmission - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/apps/iyuu-plus/latest/envs/default.env b/apps/iyuu-plus/latest/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/iyuu-plus/latest/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/iyuu-plus/latest/envs/global.env b/apps/iyuu-plus/latest/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/iyuu-plus/latest/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/iyuu-plus/latest/scripts/init.sh b/apps/iyuu-plus/latest/scripts/init.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iyuu-plus/latest/scripts/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/iyuu-plus/latest/scripts/uninstall.sh b/apps/iyuu-plus/latest/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iyuu-plus/latest/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/iyuu-plus/latest/scripts/upgrade.sh b/apps/iyuu-plus/latest/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/iyuu-plus/latest/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/jellyfin/10.10.7/envs/default.env b/apps/jellyfin/10.10.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/jellyfin/10.10.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/jellyfin/10.10.7/envs/global.env b/apps/jellyfin/10.10.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/jellyfin/10.10.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/jellyfin/10.10.7/scripts/init.sh b/apps/jellyfin/10.10.7/scripts/init.sh deleted file mode 100644 index c066befc7..000000000 --- a/apps/jellyfin/10.10.7/scripts/init.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -if [[ -f .env ]]; then - source .env - - BASE_URL="https://f.lifebus.top/public/1panel/appstore/jellyfin/" - - DEJAVU_FILES=( - "DejaVuSans.ttf" - "DejaVuSans-Bold.ttf" - "DejaVuSansMono.ttf" - "DejaVuSansMono-Bold.ttf" - "DejaVuSerif.ttf" - "DejaVuSerif-Bold.ttf" - ) - - FONT_FILES=( - "NotoSansMonoCJKsc-Bold.woff2" - "NotoSansMonoCJKsc-Regular.otf" - "NotoSansCJKsc-Regular.woff" - "NotoSansMonoCJKsc-Regular.woff" - "NotoSansMonoCJKsc-Regular.woff2" - "NotoSansMonoCJKsc-Bold.otf" - "NotoSansMonoCJKsc-Bold.woff" - "NotoSansCJKsc-Medium.otf" - "NotoSansCJKsc-Regular.otf" - "NotoSansCJKsc-Thin.woff2" - "NotoSansCJKsc-Thin.woff" - "NotoSansCJKsc-Regular.woff2" - "NotoSansCJKsc-Thin.otf" - "NotoSansCJKsc-Medium.woff" - "NotoSansCJKsc-Medium.woff2" - "NotoSansCJKsc-Light.woff" - "NotoSansCJKsc-Light.woff2" - "NotoSansCJKsc-Bold.otf" - "NotoSansCJKsc-Black.otf" - "NotoSansCJKsc-Light.otf" - "NotoSansCJKsc-Bold.woff" - "NotoSansCJKsc-DemiLight.otf" - "NotoSansCJKsc-Black.woff" - "NotoSansCJKsc-DemiLight.woff" - "NotoSansCJKsc-Black.woff2" - "NotoSansCJKsc-DemiLight.woff2" - "NotoSansCJKsc-Bold.woff2" - "font.css" - ) - - if [ ! -d "$JELLYFIN_ROOT_PATH/config/font" ]; then - mkdir -p "$JELLYFIN_ROOT_PATH/config/font" - for FILE in "${FONT_FILES[@]}"; do - wget -q "${BASE_URL}font/${FILE}" -P "$JELLYFIN_ROOT_PATH/config/font/" || echo "Failed to download $FILE, continuing..." - done - fi - - if [ ! -d "$JELLYFIN_ROOT_PATH/config/dejavu" ]; then - mkdir -p "$JELLYFIN_ROOT_PATH/config/dejavu" - for FILE in "${DEJAVU_FILES[@]}"; do - wget -q "${BASE_URL}dejavu/${FILE}" -P "$JELLYFIN_ROOT_PATH/config/dejavu/" || echo "Failed to download $FILE, continuing..." - done - fi - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/jellyfin/10.10.7/scripts/uninstall.sh b/apps/jellyfin/10.10.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/jellyfin/10.10.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/jellyfin/10.10.7/scripts/upgrade.sh b/apps/jellyfin/10.10.7/scripts/upgrade.sh deleted file mode 100644 index c066befc7..000000000 --- a/apps/jellyfin/10.10.7/scripts/upgrade.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -if [[ -f .env ]]; then - source .env - - BASE_URL="https://f.lifebus.top/public/1panel/appstore/jellyfin/" - - DEJAVU_FILES=( - "DejaVuSans.ttf" - "DejaVuSans-Bold.ttf" - "DejaVuSansMono.ttf" - "DejaVuSansMono-Bold.ttf" - "DejaVuSerif.ttf" - "DejaVuSerif-Bold.ttf" - ) - - FONT_FILES=( - "NotoSansMonoCJKsc-Bold.woff2" - "NotoSansMonoCJKsc-Regular.otf" - "NotoSansCJKsc-Regular.woff" - "NotoSansMonoCJKsc-Regular.woff" - "NotoSansMonoCJKsc-Regular.woff2" - "NotoSansMonoCJKsc-Bold.otf" - "NotoSansMonoCJKsc-Bold.woff" - "NotoSansCJKsc-Medium.otf" - "NotoSansCJKsc-Regular.otf" - "NotoSansCJKsc-Thin.woff2" - "NotoSansCJKsc-Thin.woff" - "NotoSansCJKsc-Regular.woff2" - "NotoSansCJKsc-Thin.otf" - "NotoSansCJKsc-Medium.woff" - "NotoSansCJKsc-Medium.woff2" - "NotoSansCJKsc-Light.woff" - "NotoSansCJKsc-Light.woff2" - "NotoSansCJKsc-Bold.otf" - "NotoSansCJKsc-Black.otf" - "NotoSansCJKsc-Light.otf" - "NotoSansCJKsc-Bold.woff" - "NotoSansCJKsc-DemiLight.otf" - "NotoSansCJKsc-Black.woff" - "NotoSansCJKsc-DemiLight.woff" - "NotoSansCJKsc-Black.woff2" - "NotoSansCJKsc-DemiLight.woff2" - "NotoSansCJKsc-Bold.woff2" - "font.css" - ) - - if [ ! -d "$JELLYFIN_ROOT_PATH/config/font" ]; then - mkdir -p "$JELLYFIN_ROOT_PATH/config/font" - for FILE in "${FONT_FILES[@]}"; do - wget -q "${BASE_URL}font/${FILE}" -P "$JELLYFIN_ROOT_PATH/config/font/" || echo "Failed to download $FILE, continuing..." - done - fi - - if [ ! -d "$JELLYFIN_ROOT_PATH/config/dejavu" ]; then - mkdir -p "$JELLYFIN_ROOT_PATH/config/dejavu" - for FILE in "${DEJAVU_FILES[@]}"; do - wget -q "${BASE_URL}dejavu/${FILE}" -P "$JELLYFIN_ROOT_PATH/config/dejavu/" || echo "Failed to download $FILE, continuing..." - done - fi - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/jellyseerr/2.7.3/data.yml b/apps/jellyseerr/2.7.3/data.yml index 169789670..cf3b77521 100644 --- a/apps/jellyseerr/2.7.3/data.yml +++ b/apps/jellyseerr/2.7.3/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/jellyseerr" + - default: "./data" edit: true envKey: JELLYSEERR_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/jellyseerr/2.7.3/docker-compose.yml b/apps/jellyseerr/2.7.3/docker-compose.yml index 55e687e04..529a3db42 100644 --- a/apps/jellyseerr/2.7.3/docker-compose.yml +++ b/apps/jellyseerr/2.7.3/docker-compose.yml @@ -13,11 +13,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5055 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${JELLYSEERR_ROOT_PATH}/config:/app/config + - ${JELLYSEERR_ROOT_PATH}:/app/config environment: - PORT=5055 - LOG_LEVEL=debug diff --git a/apps/jellyseerr/2.7.3/envs/default.env b/apps/jellyseerr/2.7.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/jellyseerr/2.7.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/jellyseerr/2.7.3/envs/global.env b/apps/jellyseerr/2.7.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/jellyseerr/2.7.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/jellyseerr/2.7.3/scripts/init.sh b/apps/jellyseerr/2.7.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/jellyseerr/2.7.3/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/jellyseerr/2.7.3/scripts/uninstall.sh b/apps/jellyseerr/2.7.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/jellyseerr/2.7.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/jellyseerr/2.7.3/scripts/upgrade.sh b/apps/jellyseerr/2.7.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/jellyseerr/2.7.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/jproxy/3.4.8/data.yml b/apps/jproxy/3.4.8/data.yml index 47cc1520a..a2c7adef6 100644 --- a/apps/jproxy/3.4.8/data.yml +++ b/apps/jproxy/3.4.8/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/jproxy" + - default: "./data" edit: true envKey: JPROXY_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/jproxy/3.4.8/docker-compose.yml b/apps/jproxy/3.4.8/docker-compose.yml index 07ca6a535..a8d347927 100644 --- a/apps/jproxy/3.4.8/docker-compose.yml +++ b/apps/jproxy/3.4.8/docker-compose.yml @@ -13,12 +13,16 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8117 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${JPROXY_ROOT_PATH}/data:/app/database environment: - PUID=0 - PGID=0 - TZ=Asia/Shanghai + - JAVA_OPTS=${JAVA_OPTS} + - CACHE_EXPIRES=${CACHE_EXPIRES} + - TOKEN_EXPIRES=${TOKEN_EXPIRES} + - SYNC_INTERVAL=${SYNC_INTERVAL} + - RENAME_FILE=${RENAME_FILE} + - MIN_COUNT=${MIN_COUNT} + - INDEXER_RESULT_CACHE_EXPIRES=${INDEXER_RESULT_CACHE_EXPIRES} diff --git a/apps/jproxy/3.4.8/envs/default.env b/apps/jproxy/3.4.8/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/jproxy/3.4.8/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/jproxy/3.4.8/envs/global.env b/apps/jproxy/3.4.8/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/jproxy/3.4.8/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/jproxy/3.4.8/scripts/init.sh b/apps/jproxy/3.4.8/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/jproxy/3.4.8/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/jproxy/3.4.8/scripts/uninstall.sh b/apps/jproxy/3.4.8/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/jproxy/3.4.8/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/jproxy/3.4.8/scripts/upgrade.sh b/apps/jproxy/3.4.8/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/jproxy/3.4.8/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/kavita/0.8.7/data.yml b/apps/kavita/0.8.7/data.yml index 20612acc4..4b825c2e2 100644 --- a/apps/kavita/0.8.7/data.yml +++ b/apps/kavita/0.8.7/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/kavita" + - default: "./data" edit: true envKey: KAVITA_ROOT_PATH labelZh: 数据持久化路径 @@ -15,24 +15,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/kavita/0.8.7/docker-compose.yml b/apps/kavita/0.8.7/docker-compose.yml index 6d4836e69..7b09a8296 100644 --- a/apps/kavita/0.8.7/docker-compose.yml +++ b/apps/kavita/0.8.7/docker-compose.yml @@ -13,17 +13,11 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${KAVITA_ROOT_PATH}/manga:/manga - ${KAVITA_ROOT_PATH}/comics:/comics - ${KAVITA_ROOT_PATH}/books:/books - ${KAVITA_ROOT_PATH}/config:/kavita/config - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} environment: - TZ=Asia/Shanghai - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true diff --git a/apps/kavita/0.8.7/envs/default.env b/apps/kavita/0.8.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/kavita/0.8.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/kavita/0.8.7/envs/global.env b/apps/kavita/0.8.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/kavita/0.8.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/kavita/0.8.7/scripts/init.sh b/apps/kavita/0.8.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kavita/0.8.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/kavita/0.8.7/scripts/uninstall.sh b/apps/kavita/0.8.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/kavita/0.8.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/kavita/0.8.7/scripts/upgrade.sh b/apps/kavita/0.8.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kavita/0.8.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/kimai/2.23.0/envs/default.env b/apps/kimai/2.23.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/kimai/2.23.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/kimai/2.23.0/envs/global.env b/apps/kimai/2.23.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/kimai/2.23.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/kimai/2.23.0/scripts/init.sh b/apps/kimai/2.23.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kimai/2.23.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/kimai/2.23.0/scripts/uninstall.sh b/apps/kimai/2.23.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/kimai/2.23.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/kimai/2.23.0/scripts/upgrade.sh b/apps/kimai/2.23.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kimai/2.23.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/kimai/2.23.0/data.yml b/apps/kimai/2.38.0/data.yml similarity index 98% rename from apps/kimai/2.23.0/data.yml rename to apps/kimai/2.38.0/data.yml index 1f6b1ab4e..bee6d6f5b 100644 --- a/apps/kimai/2.23.0/data.yml +++ b/apps/kimai/2.38.0/data.yml @@ -19,7 +19,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/kimai2" + - default: "./data" edit: true envKey: KIMAI2_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/kimai/2.23.0/docker-compose.yml b/apps/kimai/2.38.0/docker-compose.yml similarity index 76% rename from apps/kimai/2.23.0/docker-compose.yml rename to apps/kimai/2.38.0/docker-compose.yml index 5d7846b7a..e392301d3 100644 --- a/apps/kimai/2.23.0/docker-compose.yml +++ b/apps/kimai/2.38.0/docker-compose.yml @@ -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} diff --git a/apps/komga/1.23.3/data.yml b/apps/komga/1.23.3/data.yml index 8a710120b..87e8233e0 100644 --- a/apps/komga/1.23.3/data.yml +++ b/apps/komga/1.23.3/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/komga" + - default: "./data" edit: true envKey: KOMGA_ROOT_PATH labelZh: 数据持久化路径 @@ -15,24 +15,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/komga/1.23.3/docker-compose.yml b/apps/komga/1.23.3/docker-compose.yml index 98bad3b3a..7d1be6119 100644 --- a/apps/komga/1.23.3/docker-compose.yml +++ b/apps/komga/1.23.3/docker-compose.yml @@ -14,14 +14,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:25600 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${KOMGA_ROOT_PATH}/config:/config - ${KOMGA_ROOT_PATH}/data:/data - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} environment: - TZ=Asia/Shanghai diff --git a/apps/komga/1.23.3/envs/default.env b/apps/komga/1.23.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/komga/1.23.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/komga/1.23.3/envs/global.env b/apps/komga/1.23.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/komga/1.23.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/komga/1.23.3/scripts/init.sh b/apps/komga/1.23.3/scripts/init.sh index 8a191e3d3..0efbfe42e 100644 --- a/apps/komga/1.23.3/scripts/init.sh +++ b/apps/komga/1.23.3/scripts/init.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 copy config file mkdir -p "$KOMGA_ROOT_PATH" mkdir -p "$KOMGA_ROOT_PATH/config" mkdir -p "$KOMGA_ROOT_PATH/data" diff --git a/apps/komga/1.23.3/scripts/uninstall.sh b/apps/komga/1.23.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/komga/1.23.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/komga/1.23.3/scripts/upgrade.sh b/apps/komga/1.23.3/scripts/upgrade.sh index 6f7c43ca6..f1ec21291 100644 --- a/apps/komga/1.23.3/scripts/upgrade.sh +++ b/apps/komga/1.23.3/scripts/upgrade.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 copy config file mkdir -p "$KOMGA_ROOT_PATH" chown -R 1000:1000 "$KOMGA_ROOT_PATH" diff --git a/apps/kotatsu/v20250725/docker-compose.yml b/apps/kotatsu/v20250725/docker-compose.yml index 15e821619..a4058078f 100644 --- a/apps/kotatsu/v20250725/docker-compose.yml +++ b/apps/kotatsu/v20250725/docker-compose.yml @@ -13,8 +13,12 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai + - JWT_SECRET=${JWT_SECRET} + - DATABASE_HOST=${DATABASE_HOST} + - DATABASE_PORT=${DATABASE_PORT} + - DATABASE_NAME=${DATABASE_NAME} + - DATABASE_USER=${DATABASE_USER} + - DATABASE_PASSWORD=${DATABASE_PASSWORD} + - ALLOW_NEW_REGISTER=${ALLOW_NEW_REGISTER} diff --git a/apps/kotatsu/v20250725/envs/default.env b/apps/kotatsu/v20250725/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/kotatsu/v20250725/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/kotatsu/v20250725/envs/global.env b/apps/kotatsu/v20250725/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/kotatsu/v20250725/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/kotatsu/v20250725/scripts/init.sh b/apps/kotatsu/v20250725/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kotatsu/v20250725/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/kotatsu/v20250725/scripts/uninstall.sh b/apps/kotatsu/v20250725/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/kotatsu/v20250725/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/kotatsu/v20250725/scripts/upgrade.sh b/apps/kotatsu/v20250725/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kotatsu/v20250725/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/kvrocks/2.13.0/data.yml b/apps/kvrocks/2.13.0/data.yml index 88c952a6b..6685158cb 100644 --- a/apps/kvrocks/2.13.0/data.yml +++ b/apps/kvrocks/2.13.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/kvrocks" + - default: "./data" edit: true envKey: KVROCKS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/kvrocks/2.13.0/docker-compose.yml b/apps/kvrocks/2.13.0/docker-compose.yml index 97c2cf998..c84fbbbbd 100644 --- a/apps/kvrocks/2.13.0/docker-compose.yml +++ b/apps/kvrocks/2.13.0/docker-compose.yml @@ -13,10 +13,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:6666 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${KVROCKS_ROOT_PATH}/data:/kvrocks_data + - ${KVROCKS_ROOT_PATH}:/kvrocks_data environment: - TZ=Asia/Shanghai diff --git a/apps/kvrocks/2.13.0/envs/default.env b/apps/kvrocks/2.13.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/kvrocks/2.13.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/kvrocks/2.13.0/envs/global.env b/apps/kvrocks/2.13.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/kvrocks/2.13.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/kvrocks/2.13.0/scripts/init.sh b/apps/kvrocks/2.13.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kvrocks/2.13.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/kvrocks/2.13.0/scripts/uninstall.sh b/apps/kvrocks/2.13.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/kvrocks/2.13.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/kvrocks/2.13.0/scripts/upgrade.sh b/apps/kvrocks/2.13.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/kvrocks/2.13.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/limesurvey/6.6.5/data.yml b/apps/limesurvey/6.15.8/data.yml similarity index 98% rename from apps/limesurvey/6.6.5/data.yml rename to apps/limesurvey/6.15.8/data.yml index 60d34d129..c8a82e034 100644 --- a/apps/limesurvey/6.6.5/data.yml +++ b/apps/limesurvey/6.15.8/data.yml @@ -20,7 +20,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/limesurvey" + - default: "./data" edit: true envKey: LIMESURVEY_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/limesurvey/6.6.5/docker-compose.yml b/apps/limesurvey/6.15.8/docker-compose.yml similarity index 51% rename from apps/limesurvey/6.6.5/docker-compose.yml rename to apps/limesurvey/6.15.8/docker-compose.yml index 6bdeae63f..c0bc16c0f 100644 --- a/apps/limesurvey/6.6.5/docker-compose.yml +++ b/apps/limesurvey/6.15.8/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: limesurvey: - image: martialblog/limesurvey:6.6.5-240924-apache + image: martialblog/limesurvey:6.15.8-250825-apache container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -13,11 +13,18 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${LIMESURVEY_ROOT_PATH}/surveys:/var/www/html/upload/surveys environment: - LISTEN_PORT=8080 - PUBLIC_URL=foobar.com + - ADMIN_USER=${ADMIN_USER} + - ADMIN_NAME=${ADMIN_NAME} + - ADMIN_EMAIL=${ADMIN_EMAIL} + - ADMIN_PASSWORD=${ADMIN_PASSWORD} + - DB_TYPE=${DB_TYPE} + - DB_HOST=${DB_HOST} + - DB_PORT=${DB_PORT} + - DB_NAME=${DB_NAME} + - DB_USERNAME=${DB_USERNAME} + - DB_PASSWORD=${DB_PASSWORD} diff --git a/apps/limesurvey/6.6.5/envs/default.env b/apps/limesurvey/6.6.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/limesurvey/6.6.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/limesurvey/6.6.5/envs/global.env b/apps/limesurvey/6.6.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/limesurvey/6.6.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/limesurvey/6.6.5/scripts/init.sh b/apps/limesurvey/6.6.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/limesurvey/6.6.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/limesurvey/6.6.5/scripts/uninstall.sh b/apps/limesurvey/6.6.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/limesurvey/6.6.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/limesurvey/6.6.5/scripts/upgrade.sh b/apps/limesurvey/6.6.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/limesurvey/6.6.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/linkding/1.42.0/envs/default.env b/apps/linkding/1.42.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/linkding/1.42.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/linkding/1.42.0/envs/global.env b/apps/linkding/1.42.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/linkding/1.42.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/linkding/1.42.0/scripts/init.sh b/apps/linkding/1.42.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/linkding/1.42.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/linkding/1.42.0/scripts/uninstall.sh b/apps/linkding/1.42.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/linkding/1.42.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/linkding/1.42.0/scripts/upgrade.sh b/apps/linkding/1.42.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/linkding/1.42.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/logto/1.31.0/docker-compose.yml b/apps/logto/1.31.0/docker-compose.yml index 1880f4768..b4134037f 100644 --- a/apps/logto/1.31.0/docker-compose.yml +++ b/apps/logto/1.31.0/docker-compose.yml @@ -15,9 +15,6 @@ services: - ${PANEL_APP_PORT_API}:3001 - ${PANEL_APP_PORT_HTTP}:3002 entrypoint: [ "sh", "-c", "npm run cli db seed -- --swe && npm start" ] - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - NODE_ENV=production - PORT=3001 @@ -25,3 +22,5 @@ services: - TRUST_PROXY_HEADER=true - CASE_SENSITIVE_USERNAME=true - DB_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME} + - ENDPOINT=${ENDPOINT} + - ADMIN_ENDPOINT=${ADMIN_ENDPOINT} diff --git a/apps/logto/1.31.0/envs/default.env b/apps/logto/1.31.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/logto/1.31.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/logto/1.31.0/envs/global.env b/apps/logto/1.31.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/logto/1.31.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/logto/1.31.0/scripts/init.sh b/apps/logto/1.31.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/logto/1.31.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/logto/1.31.0/scripts/uninstall.sh b/apps/logto/1.31.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/logto/1.31.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/logto/1.31.0/scripts/upgrade.sh b/apps/logto/1.31.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/logto/1.31.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/maccms10/24.11.19/data.yml b/apps/maccms10/24.11.19/data.yml index 6001fed52..dde8e1e6d 100644 --- a/apps/maccms10/24.11.19/data.yml +++ b/apps/maccms10/24.11.19/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/maccms10" + - default: "./data" edit: true envKey: MACCMS10_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/maccms10/24.11.19/docker-compose.yml b/apps/maccms10/24.11.19/docker-compose.yml index ddcbb52d7..c7869a5b2 100644 --- a/apps/maccms10/24.11.19/docker-compose.yml +++ b/apps/maccms10/24.11.19/docker-compose.yml @@ -13,8 +13,5 @@ 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: - ${MACCMS10_ROOT_PATH}/www:/var/www diff --git a/apps/maccms10/24.11.19/envs/default.env b/apps/maccms10/24.11.19/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/maccms10/24.11.19/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/maccms10/24.11.19/envs/global.env b/apps/maccms10/24.11.19/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/maccms10/24.11.19/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/maccms10/24.11.19/scripts/init.sh b/apps/maccms10/24.11.19/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/maccms10/24.11.19/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/maccms10/24.11.19/scripts/uninstall.sh b/apps/maccms10/24.11.19/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/maccms10/24.11.19/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/maccms10/24.11.19/scripts/upgrade.sh b/apps/maccms10/24.11.19/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/maccms10/24.11.19/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/macos/2.15/data.yml b/apps/macos/2.15/data.yml index 3ef308e4c..333a06387 100644 --- a/apps/macos/2.15/data.yml +++ b/apps/macos/2.15/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/macos" + - default: "./data" edit: true envKey: MACOS_STORAGE_ROOT_PATH labelZh: MacOS 存储目录 diff --git a/apps/macos/2.15/docker-compose.yml b/apps/macos/2.15/docker-compose.yml index e2a8a8161..e51adcabf 100644 --- a/apps/macos/2.15/docker-compose.yml +++ b/apps/macos/2.15/docker-compose.yml @@ -28,9 +28,6 @@ services: # - /dev/nvidia-uvm:/dev/nvidia-uvm # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MACOS_STORAGE_ROOT_PATH}/storage:/storage environment: diff --git a/apps/macos/2.15/envs/default.env b/apps/macos/2.15/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/macos/2.15/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/macos/2.15/envs/global.env b/apps/macos/2.15/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/macos/2.15/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/macos/2.15/scripts/init.sh b/apps/macos/2.15/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/macos/2.15/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/macos/2.15/scripts/uninstall.sh b/apps/macos/2.15/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/macos/2.15/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/macos/2.15/scripts/upgrade.sh b/apps/macos/2.15/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/macos/2.15/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mailserver/15.1.0/data.yml b/apps/mailserver/15.1.0/data.yml index 3ed3d33a2..222d8729a 100644 --- a/apps/mailserver/15.1.0/data.yml +++ b/apps/mailserver/15.1.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/mailserver" + - default: "./data" edit: true envKey: MAILSERVER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/mailserver/15.1.0/docker-compose.yml b/apps/mailserver/15.1.0/docker-compose.yml index 0408833c6..d7bc1acf9 100644 --- a/apps/mailserver/15.1.0/docker-compose.yml +++ b/apps/mailserver/15.1.0/docker-compose.yml @@ -28,9 +28,7 @@ services: - ${PANEL_APP_PORT_POPS}:995 - ${PANEL_APP_PORT_MANAGESIEVE}:4190 env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/mailserver/mailserver.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - ./envs/mailserver.env volumes: - /etc/localtime:/etc/localtime:ro - ${MAILSERVER_ROOT_PATH}/dms/mail-data/:/var/mail/ diff --git a/apps/mailserver/15.1.0/envs/default.env b/apps/mailserver/15.1.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mailserver/15.1.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mailserver/15.1.0/envs/global.env b/apps/mailserver/15.1.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mailserver/15.1.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mailserver/15.1.0/scripts/init.sh b/apps/mailserver/15.1.0/scripts/init.sh deleted file mode 100644 index 07da049e6..000000000 --- a/apps/mailserver/15.1.0/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/mailserver.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mailserver/15.1.0/scripts/uninstall.sh b/apps/mailserver/15.1.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mailserver/15.1.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mailserver/15.1.0/scripts/upgrade.sh b/apps/mailserver/15.1.0/scripts/upgrade.sh deleted file mode 100644 index 07da049e6..000000000 --- a/apps/mailserver/15.1.0/scripts/upgrade.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/mailserver.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mariadb/11.8.3/data.yml b/apps/mariadb/11.8.3/data.yml index a5ca8abbb..410c3e7d5 100644 --- a/apps/mariadb/11.8.3/data.yml +++ b/apps/mariadb/11.8.3/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/mariadb" + - default: "./data" edit: true envKey: MARIADB_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/mariadb/11.8.3/docker-compose.yml b/apps/mariadb/11.8.3/docker-compose.yml index 3e19f7583..7a1db66e1 100644 --- a/apps/mariadb/11.8.3/docker-compose.yml +++ b/apps/mariadb/11.8.3/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:3306 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MARIADB_ROOT_PATH}/data:/var/lib/mysql - ${MARIADB_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf diff --git a/apps/mariadb/11.8.3/envs/default.env b/apps/mariadb/11.8.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mariadb/11.8.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mariadb/11.8.3/envs/global.env b/apps/mariadb/11.8.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mariadb/11.8.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mariadb/11.8.3/scripts/init.sh b/apps/mariadb/11.8.3/scripts/init.sh index 4d148914f..f37775ca8 100644 --- a/apps/mariadb/11.8.3/scripts/init.sh +++ b/apps/mariadb/11.8.3/scripts/init.sh @@ -3,13 +3,6 @@ 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 - mkdir -p "$MARIADB_ROOT_PATH" mkdir -p "$MARIADB_ROOT_PATH/config" mkdir -p "$MARIADB_ROOT_PATH/data" diff --git a/apps/mariadb/11.8.3/scripts/uninstall.sh b/apps/mariadb/11.8.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mariadb/11.8.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mariadb/11.8.3/scripts/upgrade.sh b/apps/mariadb/11.8.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mariadb/11.8.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/maxkb/2.0.2/data.yml b/apps/maxkb/2.0.2/data.yml index 2c48000c3..526d12cdc 100644 --- a/apps/maxkb/2.0.2/data.yml +++ b/apps/maxkb/2.0.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/maxkb" + - default: "./data" edit: true envKey: MAXKB_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/maxkb/2.0.2/docker-compose.yml b/apps/maxkb/2.0.2/docker-compose.yml index 78f63bde3..f402ad5a7 100644 --- a/apps/maxkb/2.0.2/docker-compose.yml +++ b/apps/maxkb/2.0.2/docker-compose.yml @@ -12,9 +12,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MAXKB_ROOT_PATH}/data:/var/lib/postgresql/data - ${MAXKB_ROOT_PATH}/python-packages:/opt/maxkb/app/sandbox/python-packages diff --git a/apps/maxkb/2.0.2/envs/default.env b/apps/maxkb/2.0.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/maxkb/2.0.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/maxkb/2.0.2/envs/global.env b/apps/maxkb/2.0.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/maxkb/2.0.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/maxkb/2.0.2/scripts/init.sh b/apps/maxkb/2.0.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/maxkb/2.0.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/maxkb/2.0.2/scripts/uninstall.sh b/apps/maxkb/2.0.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/maxkb/2.0.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/maxkb/2.0.2/scripts/upgrade.sh b/apps/maxkb/2.0.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/maxkb/2.0.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mcy-shop/5.0.17/data.yml b/apps/mcy-shop/5.0.17/data.yml index 178e3d66e..3c7a45eb6 100644 --- a/apps/mcy-shop/5.0.17/data.yml +++ b/apps/mcy-shop/5.0.17/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/mcy-shop" + - default: "./data" edit: true envKey: MCY_SHOP_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/mcy-shop/5.0.17/docker-compose.yml b/apps/mcy-shop/5.0.17/docker-compose.yml index 102d471ad..dff88c8f6 100644 --- a/apps/mcy-shop/5.0.17/docker-compose.yml +++ b/apps/mcy-shop/5.0.17/docker-compose.yml @@ -13,8 +13,5 @@ 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: - ${MCY_SHOP_ROOT_PATH}/data:/var/www/html diff --git a/apps/mcy-shop/5.0.17/envs/default.env b/apps/mcy-shop/5.0.17/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mcy-shop/5.0.17/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mcy-shop/5.0.17/envs/global.env b/apps/mcy-shop/5.0.17/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mcy-shop/5.0.17/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mcy-shop/5.0.17/scripts/init.sh b/apps/mcy-shop/5.0.17/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mcy-shop/5.0.17/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/mcy-shop/5.0.17/scripts/uninstall.sh b/apps/mcy-shop/5.0.17/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mcy-shop/5.0.17/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mcy-shop/5.0.17/scripts/upgrade.sh b/apps/mcy-shop/5.0.17/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mcy-shop/5.0.17/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mdc-ng/1.20.0/envs/default.env b/apps/mdc-ng/1.20.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mdc-ng/1.20.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mdc-ng/1.20.0/envs/global.env b/apps/mdc-ng/1.20.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mdc-ng/1.20.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mdc-ng/1.20.0/scripts/init.sh b/apps/mdc-ng/1.20.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mdc-ng/1.20.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/mdc-ng/1.20.0/scripts/uninstall.sh b/apps/mdc-ng/1.20.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mdc-ng/1.20.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mdc-ng/1.20.0/scripts/upgrade.sh b/apps/mdc-ng/1.20.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mdc-ng/1.20.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mediacms/4.1.0/data.yml b/apps/mediacms/4.1.0/data.yml index 339e3559f..228e48432 100644 --- a/apps/mediacms/4.1.0/data.yml +++ b/apps/mediacms/4.1.0/data.yml @@ -28,7 +28,7 @@ additionalProperties: values: - label: Redis value: redis - - default: "/home/mediacms" + - default: "./data" edit: true envKey: MEDIACMS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/mediacms/4.1.0/docker-compose.yml b/apps/mediacms/4.1.0/docker-compose.yml index 3c689fad6..0d0b6ae1d 100644 --- a/apps/mediacms/4.1.0/docker-compose.yml +++ b/apps/mediacms/4.1.0/docker-compose.yml @@ -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 diff --git a/apps/mediacms/4.1.0/envs/default.env b/apps/mediacms/4.1.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mediacms/4.1.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mediacms/4.1.0/envs/global.env b/apps/mediacms/4.1.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mediacms/4.1.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mediacms/4.1.0/scripts/init.sh b/apps/mediacms/4.1.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mediacms/4.1.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/mediacms/4.1.0/scripts/uninstall.sh b/apps/mediacms/4.1.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mediacms/4.1.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mediacms/4.1.0/scripts/upgrade.sh b/apps/mediacms/4.1.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mediacms/4.1.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/metatube-server-memory/1.3.2/data.yml b/apps/metatube-server-memory/1.3.2/data.yml index 80552a017..e3d2f00d7 100644 --- a/apps/metatube-server-memory/1.3.2/data.yml +++ b/apps/metatube-server-memory/1.3.2/data.yml @@ -1,21 +1,5 @@ additionalProperties: formFields: - - default: "1panel-network" - edit: true - envKey: NETWORK_MODE - labelZh: 网络模式 - labelEn: Network mode - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - default: 8080 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/metatube-server-memory/1.3.2/docker-compose.yml b/apps/metatube-server-memory/1.3.2/docker-compose.yml index b1f329f37..ca6cbe8da 100644 --- a/apps/metatube-server-memory/1.3.2/docker-compose.yml +++ b/apps/metatube-server-memory/1.3.2/docker-compose.yml @@ -9,12 +9,10 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - HTTPS_PROXY=${HTTP_PROXY} - DB_AUTO_MIGRATE=true diff --git a/apps/metatube-server-memory/1.3.2/envs/default.env b/apps/metatube-server-memory/1.3.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/metatube-server-memory/1.3.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/metatube-server-memory/1.3.2/envs/global.env b/apps/metatube-server-memory/1.3.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/metatube-server-memory/1.3.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/metatube-server-memory/1.3.2/scripts/init.sh b/apps/metatube-server-memory/1.3.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/metatube-server-memory/1.3.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/metatube-server-memory/1.3.2/scripts/uninstall.sh b/apps/metatube-server-memory/1.3.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/metatube-server-memory/1.3.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/metatube-server-memory/1.3.2/scripts/upgrade.sh b/apps/metatube-server-memory/1.3.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/metatube-server-memory/1.3.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/metatube-server/1.3.2/data.yml b/apps/metatube-server/1.3.2/data.yml index ca4f52002..27a787ee9 100644 --- a/apps/metatube-server/1.3.2/data.yml +++ b/apps/metatube-server/1.3.2/data.yml @@ -14,7 +14,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/metatube" + - default: "./data" edit: true envKey: METATUBE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/metatube-server/1.3.2/docker-compose.yml b/apps/metatube-server/1.3.2/docker-compose.yml index d960880e2..52407c89d 100644 --- a/apps/metatube-server/1.3.2/docker-compose.yml +++ b/apps/metatube-server/1.3.2/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${METATUBE_ROOT_PATH}/data:/var/run environment: diff --git a/apps/metatube-server/1.3.2/envs/default.env b/apps/metatube-server/1.3.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/metatube-server/1.3.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/metatube-server/1.3.2/envs/global.env b/apps/metatube-server/1.3.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/metatube-server/1.3.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/metatube-server/1.3.2/scripts/init.sh b/apps/metatube-server/1.3.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/metatube-server/1.3.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/metatube-server/1.3.2/scripts/uninstall.sh b/apps/metatube-server/1.3.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/metatube-server/1.3.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/metatube-server/1.3.2/scripts/upgrade.sh b/apps/metatube-server/1.3.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/metatube-server/1.3.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/minio/2025-05-24/data.yml b/apps/minio/2025-05-24/data.yml index 5f4f7a5a5..1c10b12a5 100644 --- a/apps/minio/2025-05-24/data.yml +++ b/apps/minio/2025-05-24/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/minio" + - default: "./data" edit: true envKey: MINIO_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/minio/2025-05-24/docker-compose.yml b/apps/minio/2025-05-24/docker-compose.yml index 0aff60477..a7cbf8ee5 100644 --- a/apps/minio/2025-05-24/docker-compose.yml +++ b/apps/minio/2025-05-24/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: minio: - image: minio/minio:RELEASE.2025-05-24T17-08-30Z + image: minio/minio:RELEASE.2025-07-23T15-54-02Z container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -15,9 +15,6 @@ services: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 volumes: diff --git a/apps/minio/2025-05-24/envs/default.env b/apps/minio/2025-05-24/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/minio/2025-05-24/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/minio/2025-05-24/envs/global.env b/apps/minio/2025-05-24/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/minio/2025-05-24/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/minio/2025-05-24/scripts/init.sh b/apps/minio/2025-05-24/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/minio/2025-05-24/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/minio/2025-05-24/scripts/uninstall.sh b/apps/minio/2025-05-24/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/minio/2025-05-24/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/minio/2025-05-24/scripts/upgrade.sh b/apps/minio/2025-05-24/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/minio/2025-05-24/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/movie-pilot/1.9.19/data.yml b/apps/movie-pilot/1.9.19/data.yml index a34b342dd..a8bcba311 100644 --- a/apps/movie-pilot/1.9.19/data.yml +++ b/apps/movie-pilot/1.9.19/data.yml @@ -1,12 +1,19 @@ additionalProperties: formFields: - - default: "/home/movie-pilot" + - default: "./data" edit: true envKey: MOVIEPILOT_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text + - default: "./downloads" + edit: true + envKey: MOVIEPILOT_DOWNLOADS_PATH + labelZh: 文件下载路径 + labelEn: Data persistence path + required: true + type: text - default: 3000 edit: true envKey: PANEL_APP_PORT_HTTP @@ -73,27 +80,6 @@ additionalProperties: value: "dev" - label: 关闭 value: "false" - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text - default: "" edit: true envKey: IYUU_SIGN diff --git a/apps/movie-pilot/1.9.19/docker-compose.yml b/apps/movie-pilot/1.9.19/docker-compose.yml index 391a97ce6..2fdfa145d 100644 --- a/apps/movie-pilot/1.9.19/docker-compose.yml +++ b/apps/movie-pilot/1.9.19/docker-compose.yml @@ -17,17 +17,12 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_API}:3001 env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/movie-pilot/movie-pilot.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - ./envs/movie-pilot.env volumes: - /var/run/docker.sock:/var/run/docker.sock - ${MOVIEPILOT_ROOT_PATH}/config:/config - ${MOVIEPILOT_ROOT_PATH}/moviepilot:/moviepilot - - ${MOVIEPILOT_ROOT_PATH}/download:/download - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${MOVIEPILOT_DOWNLOADS_PATH}:/download environment: - NGINX_PORT=3000 - PORT=3001 diff --git a/apps/movie-pilot/1.9.19/envs/default.env b/apps/movie-pilot/1.9.19/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/movie-pilot/1.9.19/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/movie-pilot/1.9.19/envs/global.env b/apps/movie-pilot/1.9.19/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/movie-pilot/1.9.19/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/movie-pilot/1.9.19/scripts/init.sh b/apps/movie-pilot/1.9.19/scripts/init.sh deleted file mode 100644 index 118f924a3..000000000 --- a/apps/movie-pilot/1.9.19/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/movie-pilot/1.9.19/scripts/uninstall.sh b/apps/movie-pilot/1.9.19/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/movie-pilot/1.9.19/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/movie-pilot/1.9.19/scripts/upgrade.sh b/apps/movie-pilot/1.9.19/scripts/upgrade.sh deleted file mode 100644 index 84793ac8a..000000000 --- a/apps/movie-pilot/1.9.19/scripts/upgrade.sh +++ /dev/null @@ -1,18 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." -else - echo "Error: .env file not found." -fi diff --git a/apps/movie-pilot/2.7.8/data.yml b/apps/movie-pilot/2.7.8/data.yml index ffeadb3d6..d08ebc392 100644 --- a/apps/movie-pilot/2.7.8/data.yml +++ b/apps/movie-pilot/2.7.8/data.yml @@ -1,12 +1,19 @@ additionalProperties: formFields: - - default: "/home/movie-pilot" + - default: "./data" edit: true envKey: MOVIEPILOT_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text + - default: "./downloads" + edit: true + envKey: MOVIEPILOT_DOWNLOADS_PATH + labelZh: 文件下载路径 + labelEn: Data persistence path + required: true + type: text - default: 3000 edit: true envKey: PANEL_APP_PORT_HTTP @@ -73,27 +80,6 @@ additionalProperties: value: "true" - label: 关闭 value: "false" - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text - default: "" edit: true envKey: IYUU_SIGN diff --git a/apps/movie-pilot/2.7.8/docker-compose.yml b/apps/movie-pilot/2.7.8/docker-compose.yml index 78ab2995f..c5f94ec86 100644 --- a/apps/movie-pilot/2.7.8/docker-compose.yml +++ b/apps/movie-pilot/2.7.8/docker-compose.yml @@ -17,18 +17,13 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_API}:3001 env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/movie-pilot/movie-pilot2.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - ./envs/movie-pilot.env volumes: - /var/run/docker.sock:/var/run/docker.sock - ${MOVIEPILOT_ROOT_PATH}/config:/config - ${MOVIEPILOT_ROOT_PATH}/ms-playwright:/moviepilot/.cache/ms-playwright - - ${MOVIEPILOT_ROOT_PATH}/download:/download - - ${MOVIEPILOT_ROOT_PATH}/media:/media - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${MOVIEPILOT_DOWNLOADS_PATH}/download:/download + - ${MOVIEPILOT_DOWNLOADS_PATH}/media:/media environment: - NGINX_PORT=3000 - PORT=3001 diff --git a/apps/movie-pilot/2.7.8/envs/default.env b/apps/movie-pilot/2.7.8/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/movie-pilot/2.7.8/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/movie-pilot/2.7.8/envs/global.env b/apps/movie-pilot/2.7.8/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/movie-pilot/2.7.8/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/movie-pilot/2.7.8/scripts/init.sh b/apps/movie-pilot/2.7.8/scripts/init.sh deleted file mode 100644 index 118f924a3..000000000 --- a/apps/movie-pilot/2.7.8/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/movie-pilot/2.7.8/scripts/uninstall.sh b/apps/movie-pilot/2.7.8/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/movie-pilot/2.7.8/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/movie-pilot/2.7.8/scripts/upgrade.sh b/apps/movie-pilot/2.7.8/scripts/upgrade.sh deleted file mode 100644 index 84793ac8a..000000000 --- a/apps/movie-pilot/2.7.8/scripts/upgrade.sh +++ /dev/null @@ -1,18 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." -else - echo "Error: .env file not found." -fi diff --git a/apps/mx-space-db/8.4.0/data.yml b/apps/mx-space-db/8.4.0/data.yml index 226ebb47a..c03f12958 100644 --- a/apps/mx-space-db/8.4.0/data.yml +++ b/apps/mx-space-db/8.4.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/mx-space" + - default: "./data" edit: true envKey: MX_SERVER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/mx-space-db/8.4.0/docker-compose.yml b/apps/mx-space-db/8.4.0/docker-compose.yml index a340a167a..d9f03da22 100644 --- a/apps/mx-space-db/8.4.0/docker-compose.yml +++ b/apps/mx-space-db/8.4.0/docker-compose.yml @@ -16,9 +16,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:2333 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MX_SERVER_ROOT_PATH}/data:/root/.mx-space environment: diff --git a/apps/mx-space-db/8.4.0/envs/default.env b/apps/mx-space-db/8.4.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mx-space-db/8.4.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mx-space-db/8.4.0/envs/global.env b/apps/mx-space-db/8.4.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mx-space-db/8.4.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mx-space-db/8.4.0/scripts/init.sh b/apps/mx-space-db/8.4.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mx-space-db/8.4.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/mx-space-db/8.4.0/scripts/uninstall.sh b/apps/mx-space-db/8.4.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mx-space-db/8.4.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mx-space-db/8.4.0/scripts/upgrade.sh b/apps/mx-space-db/8.4.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mx-space-db/8.4.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mx-space-theme-shiro/1.2.3/data.yml b/apps/mx-space-theme-shiro/1.2.3/data.yml index 22300ff45..393d6dfb8 100644 --- a/apps/mx-space-theme-shiro/1.2.3/data.yml +++ b/apps/mx-space-theme-shiro/1.2.3/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/mx-space-shiro" + - default: "./data" edit: true envKey: MX_SERVER_SHIRO_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/mx-space-theme-shiro/1.2.3/docker-compose.yml b/apps/mx-space-theme-shiro/1.2.3/docker-compose.yml index cbc055e50..f24f2c8f0 100644 --- a/apps/mx-space-theme-shiro/1.2.3/docker-compose.yml +++ b/apps/mx-space-theme-shiro/1.2.3/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:2323 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MX_SERVER_SHIRO_ROOT_PATH}/public:/app/public environment: diff --git a/apps/mx-space-theme-shiro/1.2.3/envs/default.env b/apps/mx-space-theme-shiro/1.2.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mx-space-theme-shiro/1.2.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mx-space-theme-shiro/1.2.3/envs/global.env b/apps/mx-space-theme-shiro/1.2.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mx-space-theme-shiro/1.2.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mx-space-theme-shiro/1.2.3/scripts/init.sh b/apps/mx-space-theme-shiro/1.2.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mx-space-theme-shiro/1.2.3/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/mx-space-theme-shiro/1.2.3/scripts/uninstall.sh b/apps/mx-space-theme-shiro/1.2.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mx-space-theme-shiro/1.2.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mx-space-theme-shiro/1.2.3/scripts/upgrade.sh b/apps/mx-space-theme-shiro/1.2.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mx-space-theme-shiro/1.2.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mx-space/8.4.0/data.yml b/apps/mx-space/8.4.0/data.yml index 9366174bb..c09f21770 100644 --- a/apps/mx-space/8.4.0/data.yml +++ b/apps/mx-space/8.4.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/mx-space" + - default: "./data" edit: true envKey: MX_SERVER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/mx-space/8.4.0/docker-compose.yml b/apps/mx-space/8.4.0/docker-compose.yml index b6a8c6a69..a2773f280 100644 --- a/apps/mx-space/8.4.0/docker-compose.yml +++ b/apps/mx-space/8.4.0/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:2333 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MX_SERVER_ROOT_PATH}/data:/root/.mx-space environment: diff --git a/apps/mx-space/8.4.0/envs/default.env b/apps/mx-space/8.4.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mx-space/8.4.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mx-space/8.4.0/envs/global.env b/apps/mx-space/8.4.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mx-space/8.4.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mx-space/8.4.0/scripts/init.sh b/apps/mx-space/8.4.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mx-space/8.4.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/mx-space/8.4.0/scripts/uninstall.sh b/apps/mx-space/8.4.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mx-space/8.4.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mx-space/8.4.0/scripts/upgrade.sh b/apps/mx-space/8.4.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mx-space/8.4.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mysql/5.6.51/data.yml b/apps/mysql/5.6.51/data.yml index 221fa8bde..510c93edc 100644 --- a/apps/mysql/5.6.51/data.yml +++ b/apps/mysql/5.6.51/data.yml @@ -1,17 +1,34 @@ additionalProperties: - formFields: - - default: mysql - envKey: PANEL_DB_ROOT_PASSWORD - labelEn: Root Password - labelZh: root用户密码 - random: true - required: true - rule: paramComplexity - type: password - - default: 3306 - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number + formFields: + - default: mysql + envKey: PANEL_DB_ROOT_PASSWORD + labelEn: Root Password + labelZh: root用户密码 + random: true + required: true + type: password + label: + en: Root Password + ja: ルートパスワード + ms: Kata Laluan Root + pt-br: Senha Root + ru: Пароль Root + ko: 루트 비밀번호 + zh-Hant: Root 密碼 + zh: Root 密码 + - default: 3306 + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + label: + en: Port + ja: ポート + ms: Port + pt-br: Porta + ru: Порт + ko: 포트 + zh-Hant: 埠 + zh: 端口 \ No newline at end of file diff --git a/apps/mysql/5.6.51/docker-compose.yml b/apps/mysql/5.6.51/docker-compose.yml index 5ffde8989..44ade8220 100644 --- a/apps/mysql/5.6.51/docker-compose.yml +++ b/apps/mysql/5.6.51/docker-compose.yml @@ -1,4 +1,3 @@ - services: mysql: image: mysql:5.6.51 @@ -15,10 +14,10 @@ services: - ./conf/my.cnf:/etc/mysql/my.cnf - ./log:/var/log/mysql command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true - --lower_case_table_names=1 + - --character-set-server=utf8mb4 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true + - --lower_case_table_names=1 labels: createdBy: "Apps" networks: diff --git a/apps/mysql/5.7.44/config/my.cnf b/apps/mysql/5.7.44/config/my.cnf deleted file mode 100644 index 6d6e1a932..000000000 --- a/apps/mysql/5.7.44/config/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files -user=mysql - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M -character_set_server=utf8mb4 -lower_case_table_names=1 -group_concat_max_len=1024000 - -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/apps/mysql/5.7.44/data.yml b/apps/mysql/5.7.44/data.yml index 221fa8bde..ede1da18b 100644 --- a/apps/mysql/5.7.44/data.yml +++ b/apps/mysql/5.7.44/data.yml @@ -6,8 +6,16 @@ additionalProperties: labelZh: root用户密码 random: true required: true - rule: paramComplexity type: password + label: + en: Root Password + ja: ルートパスワード + ms: Kata Laluan Root + pt-br: Senha Root + ru: Пароль Root + ko: 루트 비밀번호 + zh-Hant: Root 密碼 + zh: Root 密码 - default: 3306 envKey: PANEL_APP_PORT_HTTP labelEn: Port @@ -15,3 +23,12 @@ additionalProperties: required: true rule: paramPort type: number + label: + en: Port + ja: ポート + ms: Port + pt-br: Porta + ru: Порт + ko: 포트 + zh-Hant: 埠 + zh: 端口 \ No newline at end of file diff --git a/apps/mysql/5.7.44/docker-compose.yml b/apps/mysql/5.7.44/docker-compose.yml index 068a579a7..a7332cce3 100644 --- a/apps/mysql/5.7.44/docker-compose.yml +++ b/apps/mysql/5.7.44/docker-compose.yml @@ -1,4 +1,3 @@ - services: mysql: image: mysql:5.7.44 @@ -17,10 +16,10 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true - --lower_case_table_names=1 + - --character-set-server=utf8mb4 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true + - --lower_case_table_names=1 labels: createdBy: "Apps" networks: diff --git a/apps/mysql/5.7.44/envs/default.env b/apps/mysql/5.7.44/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mysql/5.7.44/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mysql/5.7.44/envs/global.env b/apps/mysql/5.7.44/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mysql/5.7.44/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mysql/5.7.44/scripts/init.sh b/apps/mysql/5.7.44/scripts/init.sh deleted file mode 100644 index 1cdd90c20..000000000 --- a/apps/mysql/5.7.44/scripts/init.sh +++ /dev/null @@ -1,26 +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 - - mkdir -p "$MYSQL_ROOT_PATH" - mkdir -p "$MYSQL_ROOT_PATH/config" - mkdir -p "$MYSQL_ROOT_PATH/data" - mkdir -p "$MYSQL_ROOT_PATH/log" - - cp ./config/my.cnf "$MYSQL_ROOT_PATH/config/my.cnf" - - chown -R 1000:1000 "$MYSQL_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mysql/5.7.44/scripts/uninstall.sh b/apps/mysql/5.7.44/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mysql/5.7.44/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mysql/5.7.44/scripts/upgrade.sh b/apps/mysql/5.7.44/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mysql/5.7.44/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mysql/8.0.40/data.yml b/apps/mysql/8.0.40/data.yml deleted file mode 100644 index e71c6a387..000000000 --- a/apps/mysql/8.0.40/data.yml +++ /dev/null @@ -1,17 +0,0 @@ -additionalProperties: - formFields: - - default: mysql - envKey: PANEL_DB_ROOT_PASSWORD - labelEn: Root Password - labelZh: root用户密码 - random: true - required: true - rule: paramComplexity - type: password - - default: 3306 - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number diff --git a/apps/mysql/8.0.40/conf/my.cnf b/apps/mysql/8.0.43/conf/my.cnf similarity index 100% rename from apps/mysql/8.0.40/conf/my.cnf rename to apps/mysql/8.0.43/conf/my.cnf diff --git a/apps/mysql/8.0.43/data.yml b/apps/mysql/8.0.43/data.yml new file mode 100644 index 000000000..ede1da18b --- /dev/null +++ b/apps/mysql/8.0.43/data.yml @@ -0,0 +1,34 @@ +additionalProperties: + formFields: + - default: mysql + envKey: PANEL_DB_ROOT_PASSWORD + labelEn: Root Password + labelZh: root用户密码 + random: true + required: true + type: password + label: + en: Root Password + ja: ルートパスワード + ms: Kata Laluan Root + pt-br: Senha Root + ru: Пароль Root + ko: 루트 비밀번호 + zh-Hant: Root 密碼 + zh: Root 密码 + - default: 3306 + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + label: + en: Port + ja: ポート + ms: Port + pt-br: Porta + ru: Порт + ko: 포트 + zh-Hant: 埠 + zh: 端口 \ No newline at end of file diff --git a/apps/mysql/8.0.40/docker-compose.yml b/apps/mysql/8.0.43/docker-compose.yml similarity index 96% rename from apps/mysql/8.0.40/docker-compose.yml rename to apps/mysql/8.0.43/docker-compose.yml index 33626b30f..a87efaa24 100644 --- a/apps/mysql/8.0.40/docker-compose.yml +++ b/apps/mysql/8.0.43/docker-compose.yml @@ -1,6 +1,6 @@ services: mysql: - image: mysql:8.0.40 + image: mysql:8.0.43 container_name: ${CONTAINER_NAME} restart: always environment: diff --git a/apps/mysql/8.4.3/data.yml b/apps/mysql/8.4.3/data.yml deleted file mode 100644 index 221fa8bde..000000000 --- a/apps/mysql/8.4.3/data.yml +++ /dev/null @@ -1,17 +0,0 @@ -additionalProperties: - formFields: - - default: mysql - envKey: PANEL_DB_ROOT_PASSWORD - labelEn: Root Password - labelZh: root用户密码 - random: true - required: true - rule: paramComplexity - type: password - - default: 3306 - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number diff --git a/apps/mysql/8.4.5/config/my.cnf b/apps/mysql/8.4.5/config/my.cnf deleted file mode 100644 index c53ca32dc..000000000 --- a/apps/mysql/8.4.5/config/my.cnf +++ /dev/null @@ -1,20 +0,0 @@ -[mysqld] -host_cache_size=0 -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -user=mysql - -mysql_native_password=ON -character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci -lower_case_table_names=1 -group_concat_max_len=1024000 -log_bin_trust_function_creators=1 - -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ diff --git a/apps/mysql/8.4.5/data.yml b/apps/mysql/8.4.5/data.yml deleted file mode 100644 index b5a364287..000000000 --- a/apps/mysql/8.4.5/data.yml +++ /dev/null @@ -1,24 +0,0 @@ -additionalProperties: - formFields: - - default: "/home/mysql" - edit: true - envKey: MYSQL_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 3306 - envKey: PANEL_APP_PORT_HTTP - labelZh: 连接端口 - labelEn: Connection Port - required: true - rule: paramPort - type: number - - default: "" - envKey: MYSQL_ROOT_PASSWORD - labelZh: 管理员密码 - labelEn: Admin Password - random: true - required: true - rule: paramComplexity - type: password diff --git a/apps/mysql/8.4.5/docker-compose.yml b/apps/mysql/8.4.5/docker-compose.yml deleted file mode 100644 index a10449d67..000000000 --- a/apps/mysql/8.4.5/docker-compose.yml +++ /dev/null @@ -1,29 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - mysql: - image: mysql:8.4.5 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - user: 1000:1000 - ports: - - ${PANEL_APP_PORT_HTTP}:3306 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - command: - - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON diff --git a/apps/mysql/8.4.5/envs/default.env b/apps/mysql/8.4.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/mysql/8.4.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/mysql/8.4.5/envs/global.env b/apps/mysql/8.4.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/mysql/8.4.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/mysql/8.4.5/scripts/init.sh b/apps/mysql/8.4.5/scripts/init.sh deleted file mode 100644 index 1cdd90c20..000000000 --- a/apps/mysql/8.4.5/scripts/init.sh +++ /dev/null @@ -1,26 +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 - - mkdir -p "$MYSQL_ROOT_PATH" - mkdir -p "$MYSQL_ROOT_PATH/config" - mkdir -p "$MYSQL_ROOT_PATH/data" - mkdir -p "$MYSQL_ROOT_PATH/log" - - cp ./config/my.cnf "$MYSQL_ROOT_PATH/config/my.cnf" - - chown -R 1000:1000 "$MYSQL_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mysql/8.4.5/scripts/uninstall.sh b/apps/mysql/8.4.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/mysql/8.4.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/mysql/8.4.5/scripts/upgrade.sh b/apps/mysql/8.4.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/mysql/8.4.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/mysql/8.4.3/conf/my.cnf b/apps/mysql/8.4.6/conf/my.cnf similarity index 80% rename from apps/mysql/8.4.3/conf/my.cnf rename to apps/mysql/8.4.6/conf/my.cnf index 13e999b0e..d59241a2d 100644 --- a/apps/mysql/8.4.3/conf/my.cnf +++ b/apps/mysql/8.4.6/conf/my.cnf @@ -7,7 +7,8 @@ secure-file-priv=/var/lib/mysql-files user=mysql pid-file=/var/run/mysqld/mysqld.pid +lower_case_table_names=1 [client] socket=/var/run/mysqld/mysqld.sock -!includedir /etc/mysql/conf.d/ \ No newline at end of file +!includedir /etc/mysql/conf.d/ diff --git a/apps/mysql/8.4.6/data.yml b/apps/mysql/8.4.6/data.yml new file mode 100644 index 000000000..ede1da18b --- /dev/null +++ b/apps/mysql/8.4.6/data.yml @@ -0,0 +1,34 @@ +additionalProperties: + formFields: + - default: mysql + envKey: PANEL_DB_ROOT_PASSWORD + labelEn: Root Password + labelZh: root用户密码 + random: true + required: true + type: password + label: + en: Root Password + ja: ルートパスワード + ms: Kata Laluan Root + pt-br: Senha Root + ru: Пароль Root + ko: 루트 비밀번호 + zh-Hant: Root 密碼 + zh: Root 密码 + - default: 3306 + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + label: + en: Port + ja: ポート + ms: Port + pt-br: Porta + ru: Порт + ko: 포트 + zh-Hant: 埠 + zh: 端口 \ No newline at end of file diff --git a/apps/mysql/8.4.3/docker-compose.yml b/apps/mysql/8.4.6/docker-compose.yml similarity index 87% rename from apps/mysql/8.4.3/docker-compose.yml rename to apps/mysql/8.4.6/docker-compose.yml index e0d227dd9..cdb93d07d 100644 --- a/apps/mysql/8.4.3/docker-compose.yml +++ b/apps/mysql/8.4.6/docker-compose.yml @@ -1,6 +1,6 @@ services: mysql: - image: mysql:8.4.3 + image: mysql:8.4.6 container_name: ${CONTAINER_NAME} restart: always environment: @@ -17,8 +17,6 @@ services: - /etc/localtime:/etc/localtime:ro labels: createdBy: "Apps" - command: - - --mysql-native-password=on networks: 1panel-network: external: true diff --git a/apps/mysql/8.4.3/scripts/upgrade.sh b/apps/mysql/8.4.6/scripts/upgrade.sh similarity index 100% rename from apps/mysql/8.4.3/scripts/upgrade.sh rename to apps/mysql/8.4.6/scripts/upgrade.sh diff --git a/apps/n8n/1.109.1/data.yml b/apps/n8n/1.109.1/data.yml index 43878e8b5..dd3aa35d7 100644 --- a/apps/n8n/1.109.1/data.yml +++ b/apps/n8n/1.109.1/data.yml @@ -14,7 +14,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/n8n" + - default: "./data" edit: true envKey: N8N_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/n8n/1.109.1/docker-compose.yml b/apps/n8n/1.109.1/docker-compose.yml index beda982a8..7e03653b8 100644 --- a/apps/n8n/1.109.1/docker-compose.yml +++ b/apps/n8n/1.109.1/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5678 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${N8N_ROOT_PATH}/data:/home/node/.n8n environment: diff --git a/apps/n8n/1.109.1/envs/default.env b/apps/n8n/1.109.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/n8n/1.109.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/n8n/1.109.1/envs/global.env b/apps/n8n/1.109.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/n8n/1.109.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/n8n/1.109.1/scripts/init.sh b/apps/n8n/1.109.1/scripts/init.sh index f776f3c16..0948f2063 100644 --- a/apps/n8n/1.109.1/scripts/init.sh +++ b/apps/n8n/1.109.1/scripts/init.sh @@ -3,13 +3,6 @@ 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 - DATA_DIR="$N8N_ROOT_PATH/data" mkdir -p "$DATA_DIR" diff --git a/apps/n8n/1.109.1/scripts/uninstall.sh b/apps/n8n/1.109.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/n8n/1.109.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/n8n/1.109.1/scripts/upgrade.sh b/apps/n8n/1.109.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/n8n/1.109.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/nacos-derby/3.0.3/data.yml b/apps/nacos-derby/3.0.3/data.yml index 4cd8af7af..625dea19a 100644 --- a/apps/nacos-derby/3.0.3/data.yml +++ b/apps/nacos-derby/3.0.3/data.yml @@ -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/nacos" + - default: "./data" edit: true envKey: NACOS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/nacos-derby/3.0.3/docker-compose.yml b/apps/nacos-derby/3.0.3/docker-compose.yml index bf9adcf84..dca4d99bd 100644 --- a/apps/nacos-derby/3.0.3/docker-compose.yml +++ b/apps/nacos-derby/3.0.3/docker-compose.yml @@ -9,14 +9,12 @@ services: restart: always labels: createdBy: "Apps" - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} - ${PANEL_APP_PORT_GRPC}:9848 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs - ${NACOS_ROOT_PATH}/data:/home/nacos/data diff --git a/apps/nacos-derby/3.0.3/envs/default.env b/apps/nacos-derby/3.0.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nacos-derby/3.0.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nacos-derby/3.0.3/envs/global.env b/apps/nacos-derby/3.0.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nacos-derby/3.0.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nacos-derby/3.0.3/scripts/init.sh b/apps/nacos-derby/3.0.3/scripts/init.sh index 19193ac7b..88691a0f2 100644 --- a/apps/nacos-derby/3.0.3/scripts/init.sh +++ b/apps/nacos-derby/3.0.3/scripts/init.sh @@ -3,13 +3,6 @@ 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 - if command -v mysql &> /dev/null; then if [[ -f ./init/mysql-schema.sql ]]; then mysql -u"$MYSQL_SERVICE_USER" -p"$MYSQL_SERVICE_PASSWORD" -h"$MYSQL_SERVICE_HOST" -P"$MYSQL_SERVICE_PORT" --protocol=TCP "$MYSQL_SERVICE_DB_NAME" < ./init/mysql-schema.sql diff --git a/apps/nacos-derby/3.0.3/scripts/uninstall.sh b/apps/nacos-derby/3.0.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nacos-derby/3.0.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nacos-derby/3.0.3/scripts/upgrade.sh b/apps/nacos-derby/3.0.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nacos-derby/3.0.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/nacos/3.0.3/data.yml b/apps/nacos/3.0.3/data.yml index d53d09549..995d23c58 100644 --- a/apps/nacos/3.0.3/data.yml +++ b/apps/nacos/3.0.3/data.yml @@ -19,23 +19,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - 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/nacos" + - default: "./data" edit: true envKey: NACOS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/nacos/3.0.3/docker-compose.yml b/apps/nacos/3.0.3/docker-compose.yml index 62ee73976..7f4c76e1b 100644 --- a/apps/nacos/3.0.3/docker-compose.yml +++ b/apps/nacos/3.0.3/docker-compose.yml @@ -9,14 +9,12 @@ services: restart: always labels: createdBy: "Apps" - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} - ${PANEL_APP_PORT_GRPC}:9848 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs - ${NACOS_ROOT_PATH}/data:/home/nacos/data diff --git a/apps/nacos/3.0.3/envs/default.env b/apps/nacos/3.0.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nacos/3.0.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nacos/3.0.3/envs/global.env b/apps/nacos/3.0.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nacos/3.0.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nacos/3.0.3/scripts/init.sh b/apps/nacos/3.0.3/scripts/init.sh index 19193ac7b..88691a0f2 100644 --- a/apps/nacos/3.0.3/scripts/init.sh +++ b/apps/nacos/3.0.3/scripts/init.sh @@ -3,13 +3,6 @@ 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 - if command -v mysql &> /dev/null; then if [[ -f ./init/mysql-schema.sql ]]; then mysql -u"$MYSQL_SERVICE_USER" -p"$MYSQL_SERVICE_PASSWORD" -h"$MYSQL_SERVICE_HOST" -P"$MYSQL_SERVICE_PORT" --protocol=TCP "$MYSQL_SERVICE_DB_NAME" < ./init/mysql-schema.sql diff --git a/apps/nacos/3.0.3/scripts/uninstall.sh b/apps/nacos/3.0.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nacos/3.0.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nacos/3.0.3/scripts/upgrade.sh b/apps/nacos/3.0.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nacos/3.0.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-brave/3.0.7/data.yml b/apps/neko-brave/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-brave/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-brave/3.0.7/docker-compose.yml b/apps/neko-brave/3.0.7/docker-compose.yml deleted file mode 100644 index 815a09ca3..000000000 --- a/apps/neko-brave/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/brave:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-brave/3.0.7/envs/default.env b/apps/neko-brave/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-brave/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-brave/3.0.7/envs/global.env b/apps/neko-brave/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-brave/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-brave/3.0.7/scripts/init.sh b/apps/neko-brave/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-brave/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-brave/3.0.7/scripts/uninstall.sh b/apps/neko-brave/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-brave/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-brave/3.0.7/scripts/upgrade.sh b/apps/neko-brave/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-brave/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-brave/README.md b/apps/neko-brave/README.md deleted file mode 100644 index 5049a387d..000000000 --- a/apps/neko-brave/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Brave版) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - - - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-brave/data.yml b/apps/neko-brave/data.yml deleted file mode 100644 index 611ce2dba..000000000 --- a/apps/neko-brave/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-brave - name: Neko (Brave版) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-brave/logo.png b/apps/neko-brave/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-brave/logo.png and /dev/null differ diff --git a/apps/neko-chromium/3.0.6/data.yml b/apps/neko-chromium/3.0.6/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-chromium/3.0.6/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-chromium/3.0.6/docker-compose.yml b/apps/neko-chromium/3.0.6/docker-compose.yml deleted file mode 100644 index fefb987ab..000000000 --- a/apps/neko-chromium/3.0.6/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/chromium:3.0.6 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-chromium/3.0.6/envs/default.env b/apps/neko-chromium/3.0.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-chromium/3.0.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-chromium/3.0.6/envs/global.env b/apps/neko-chromium/3.0.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-chromium/3.0.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-chromium/3.0.6/scripts/init.sh b/apps/neko-chromium/3.0.6/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-chromium/3.0.6/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-chromium/3.0.6/scripts/uninstall.sh b/apps/neko-chromium/3.0.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-chromium/3.0.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-chromium/3.0.6/scripts/upgrade.sh b/apps/neko-chromium/3.0.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-chromium/3.0.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-chromium/README.md b/apps/neko-chromium/README.md deleted file mode 100644 index 7eb92556f..000000000 --- a/apps/neko-chromium/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Chromium版) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - -![chromium](https://neko.m1k1o.net/img/icons/chromium.svg) - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-chromium/data.yml b/apps/neko-chromium/data.yml deleted file mode 100644 index 4585469b0..000000000 --- a/apps/neko-chromium/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-chromium - name: Neko (Chromium版) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-chromium/logo.png b/apps/neko-chromium/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-chromium/logo.png and /dev/null differ diff --git a/apps/neko-firefox/3.0.7/data.yml b/apps/neko-firefox/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-firefox/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-firefox/3.0.7/docker-compose.yml b/apps/neko-firefox/3.0.7/docker-compose.yml deleted file mode 100644 index 44041fcc8..000000000 --- a/apps/neko-firefox/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/firefox:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-firefox/3.0.7/envs/default.env b/apps/neko-firefox/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-firefox/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-firefox/3.0.7/envs/global.env b/apps/neko-firefox/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-firefox/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-firefox/3.0.7/scripts/init.sh b/apps/neko-firefox/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-firefox/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-firefox/3.0.7/scripts/uninstall.sh b/apps/neko-firefox/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-firefox/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-firefox/3.0.7/scripts/upgrade.sh b/apps/neko-firefox/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-firefox/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-firefox/README.md b/apps/neko-firefox/README.md deleted file mode 100644 index 442d5ecd0..000000000 --- a/apps/neko-firefox/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (火狐版) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - -![firefox](https://neko.m1k1o.net/img/icons/firefox.svg) - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-firefox/data.yml b/apps/neko-firefox/data.yml deleted file mode 100644 index 064029b1b..000000000 --- a/apps/neko-firefox/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-firefox - name: Neko (FireFox版) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-firefox/logo.png b/apps/neko-firefox/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-firefox/logo.png and /dev/null differ diff --git a/apps/neko-google-chrome/3.0.7/data.yml b/apps/neko-google-chrome/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-google-chrome/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-google-chrome/3.0.7/docker-compose.yml b/apps/neko-google-chrome/3.0.7/docker-compose.yml deleted file mode 100644 index bb5dc1e94..000000000 --- a/apps/neko-google-chrome/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/google-chrome:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-google-chrome/3.0.7/envs/default.env b/apps/neko-google-chrome/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-google-chrome/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-google-chrome/3.0.7/envs/global.env b/apps/neko-google-chrome/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-google-chrome/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-google-chrome/3.0.7/scripts/init.sh b/apps/neko-google-chrome/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-google-chrome/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-google-chrome/3.0.7/scripts/uninstall.sh b/apps/neko-google-chrome/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-google-chrome/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-google-chrome/3.0.7/scripts/upgrade.sh b/apps/neko-google-chrome/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-google-chrome/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-google-chrome/README.md b/apps/neko-google-chrome/README.md deleted file mode 100644 index e85104d52..000000000 --- a/apps/neko-google-chrome/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Google Chrome版版) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - - - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-google-chrome/data.yml b/apps/neko-google-chrome/data.yml deleted file mode 100644 index 76725556b..000000000 --- a/apps/neko-google-chrome/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-google-chrome - name: Neko (Google Chrome版) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-google-chrome/logo.png b/apps/neko-google-chrome/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-google-chrome/logo.png and /dev/null differ diff --git a/apps/neko-kde/3.0.6/data.yml b/apps/neko-kde/3.0.6/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-kde/3.0.6/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-kde/3.0.6/docker-compose.yml b/apps/neko-kde/3.0.6/docker-compose.yml deleted file mode 100644 index 5191b45e2..000000000 --- a/apps/neko-kde/3.0.6/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/kde:3.0.6 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-kde/3.0.6/envs/default.env b/apps/neko-kde/3.0.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-kde/3.0.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-kde/3.0.6/envs/global.env b/apps/neko-kde/3.0.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-kde/3.0.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-kde/3.0.6/scripts/init.sh b/apps/neko-kde/3.0.6/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-kde/3.0.6/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-kde/3.0.6/scripts/uninstall.sh b/apps/neko-kde/3.0.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-kde/3.0.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-kde/3.0.6/scripts/upgrade.sh b/apps/neko-kde/3.0.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-kde/3.0.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-kde/README.md b/apps/neko-kde/README.md deleted file mode 100644 index 5110919f9..000000000 --- a/apps/neko-kde/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Kde 丰富桌面环境) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - -![kde](https://neko.m1k1o.net/img/icons/kde.svg) - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-kde/data.yml b/apps/neko-kde/data.yml deleted file mode 100644 index 0caaccb2b..000000000 --- a/apps/neko-kde/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-kde - name: Neko (Kde丰富桌面环境) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-kde/logo.png b/apps/neko-kde/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-kde/logo.png and /dev/null differ diff --git a/apps/neko-microsoft-edge/3.0.7/data.yml b/apps/neko-microsoft-edge/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-microsoft-edge/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-microsoft-edge/3.0.7/docker-compose.yml b/apps/neko-microsoft-edge/3.0.7/docker-compose.yml deleted file mode 100644 index 8bf593cbf..000000000 --- a/apps/neko-microsoft-edge/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/microsoft-edge:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-microsoft-edge/3.0.7/envs/default.env b/apps/neko-microsoft-edge/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-microsoft-edge/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-microsoft-edge/3.0.7/envs/global.env b/apps/neko-microsoft-edge/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-microsoft-edge/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-microsoft-edge/3.0.7/scripts/init.sh b/apps/neko-microsoft-edge/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-microsoft-edge/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-microsoft-edge/3.0.7/scripts/uninstall.sh b/apps/neko-microsoft-edge/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-microsoft-edge/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-microsoft-edge/3.0.7/scripts/upgrade.sh b/apps/neko-microsoft-edge/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-microsoft-edge/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-microsoft-edge/README.md b/apps/neko-microsoft-edge/README.md deleted file mode 100644 index d35ce4c94..000000000 --- a/apps/neko-microsoft-edge/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Microsoft Edge版) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - - - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-microsoft-edge/data.yml b/apps/neko-microsoft-edge/data.yml deleted file mode 100644 index d66bc40b6..000000000 --- a/apps/neko-microsoft-edge/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-microsoft-edge - name: Neko (Microsoft Edge版) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-microsoft-edge/logo.png b/apps/neko-microsoft-edge/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-microsoft-edge/logo.png and /dev/null differ diff --git a/apps/neko-remmina/3.0.7/data.yml b/apps/neko-remmina/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-remmina/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-remmina/3.0.7/docker-compose.yml b/apps/neko-remmina/3.0.7/docker-compose.yml deleted file mode 100644 index 3e9f0dd31..000000000 --- a/apps/neko-remmina/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/remmina:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-remmina/3.0.7/envs/default.env b/apps/neko-remmina/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-remmina/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-remmina/3.0.7/envs/global.env b/apps/neko-remmina/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-remmina/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-remmina/3.0.7/scripts/init.sh b/apps/neko-remmina/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-remmina/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-remmina/3.0.7/scripts/uninstall.sh b/apps/neko-remmina/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-remmina/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-remmina/3.0.7/scripts/upgrade.sh b/apps/neko-remmina/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-remmina/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-remmina/README.md b/apps/neko-remmina/README.md deleted file mode 100644 index 88bb12573..000000000 --- a/apps/neko-remmina/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Remmina 远程桌面客户端) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - - - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-remmina/data.yml b/apps/neko-remmina/data.yml deleted file mode 100644 index 92b97d71c..000000000 --- a/apps/neko-remmina/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-remmina - name: Neko (Remmina远程桌面客户端) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-remmina/logo.png b/apps/neko-remmina/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-remmina/logo.png and /dev/null differ diff --git a/apps/neko-tor-browser/3.0.7/data.yml b/apps/neko-tor-browser/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-tor-browser/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-tor-browser/3.0.7/docker-compose.yml b/apps/neko-tor-browser/3.0.7/docker-compose.yml deleted file mode 100644 index a77ae35b1..000000000 --- a/apps/neko-tor-browser/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/tor-browser:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-tor-browser/3.0.7/envs/default.env b/apps/neko-tor-browser/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-tor-browser/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-tor-browser/3.0.7/envs/global.env b/apps/neko-tor-browser/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-tor-browser/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-tor-browser/3.0.7/scripts/init.sh b/apps/neko-tor-browser/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-tor-browser/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-tor-browser/3.0.7/scripts/uninstall.sh b/apps/neko-tor-browser/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-tor-browser/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-tor-browser/3.0.7/scripts/upgrade.sh b/apps/neko-tor-browser/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-tor-browser/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-tor-browser/README.md b/apps/neko-tor-browser/README.md deleted file mode 100644 index 9cef430d6..000000000 --- a/apps/neko-tor-browser/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (洋葱浏览器版) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - - - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-tor-browser/data.yml b/apps/neko-tor-browser/data.yml deleted file mode 100644 index 3cb825a5e..000000000 --- a/apps/neko-tor-browser/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-tor-browser - name: Neko (Tor Browser版) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-tor-browser/logo.png b/apps/neko-tor-browser/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-tor-browser/logo.png and /dev/null differ diff --git a/apps/neko-vlc/3.0.7/data.yml b/apps/neko-vlc/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-vlc/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-vlc/3.0.7/docker-compose.yml b/apps/neko-vlc/3.0.7/docker-compose.yml deleted file mode 100644 index ac08f8c45..000000000 --- a/apps/neko-vlc/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/vlc:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-vlc/3.0.7/envs/default.env b/apps/neko-vlc/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-vlc/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-vlc/3.0.7/envs/global.env b/apps/neko-vlc/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-vlc/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-vlc/3.0.7/scripts/init.sh b/apps/neko-vlc/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-vlc/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-vlc/3.0.7/scripts/uninstall.sh b/apps/neko-vlc/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-vlc/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-vlc/3.0.7/scripts/upgrade.sh b/apps/neko-vlc/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-vlc/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-vlc/README.md b/apps/neko-vlc/README.md deleted file mode 100644 index 3504c1cb4..000000000 --- a/apps/neko-vlc/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Vlc 媒体播放器) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - - - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-vlc/data.yml b/apps/neko-vlc/data.yml deleted file mode 100644 index 91ffcfe44..000000000 --- a/apps/neko-vlc/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-vlc - name: Neko (Vlc媒体播放器) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-vlc/logo.png b/apps/neko-vlc/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-vlc/logo.png and /dev/null differ diff --git a/apps/neko-xfce/3.0.7/data.yml b/apps/neko-xfce/3.0.7/data.yml deleted file mode 100644 index 85479c619..000000000 --- a/apps/neko-xfce/3.0.7/data.yml +++ /dev/null @@ -1,45 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "56000-56100" - edit: true - envKey: PANEL_APP_PORT_WEBRTC_EPR - labelZh: WebRTC 端口范围 - labelEn: WebRTC port range - required: true - type: text - - default: "admin" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD - labelZh: 管理员密码 - labelEn: 管理员密码 - required: true - type: password - - default: "neko" - edit: true - envKey: NEKO_MEMBER_MULTIUSER_USER_PASSWORD - labelZh: 用户密码 - labelEn: 用户密码 - required: true - type: password - - default: "1920x1080@30" - edit: true - envKey: NEKO_DESKTOP_SCREEN - labelZh: 桌面分辨率 - labelEn: Desktop Resolution - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: NEKO_WEBRTC_NAT1TO1 - labelZh: 访问主机 (NAT1TO1) - labelEn: Access Host (NAT1TO1) - required: true - type: text diff --git a/apps/neko-xfce/3.0.7/docker-compose.yml b/apps/neko-xfce/3.0.7/docker-compose.yml deleted file mode 100644 index 310e7e988..000000000 --- a/apps/neko-xfce/3.0.7/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - neko: - image: ghcr.io/m1k1o/neko/xfce:3.0.7 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - cap_add: - - SYS_ADMIN - shm_size: "2gb" - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:8080 - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR} - - ${PANEL_APP_PORT_WEBRTC_EPR}:${PANEL_APP_PORT_WEBRTC_EPR}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - TZ=Asia/Shanghai - - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - - NEKO_WEBRTC_ICELITE=1 - - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip diff --git a/apps/neko-xfce/3.0.7/envs/default.env b/apps/neko-xfce/3.0.7/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/neko-xfce/3.0.7/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/neko-xfce/3.0.7/envs/global.env b/apps/neko-xfce/3.0.7/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/neko-xfce/3.0.7/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/neko-xfce/3.0.7/scripts/init.sh b/apps/neko-xfce/3.0.7/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-xfce/3.0.7/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/neko-xfce/3.0.7/scripts/uninstall.sh b/apps/neko-xfce/3.0.7/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/neko-xfce/3.0.7/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/neko-xfce/3.0.7/scripts/upgrade.sh b/apps/neko-xfce/3.0.7/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/neko-xfce/3.0.7/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/neko-xfce/README.md b/apps/neko-xfce/README.md deleted file mode 100644 index ecd172d6c..000000000 --- a/apps/neko-xfce/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Neko (Xface 轻量桌面环境) - -在 docker 中运行并使用 WebRTC 的自托管虚拟浏览器 - -![Neko](https://file.lifebus.top/imgs/neko_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - - - -Neko，这是一个在 Docker 中运行并使用 WebRTC 技术的自托管虚拟浏览器。Neko -是一款功能强大的工具，可让您在虚拟环境中运行功能齐全的浏览器，使您能够从任何地方安全、私密地访问互联网。使用 -Neko，您可以像在普通浏览器上一样浏览网页、运行应用程序和执行其他任务，所有这些都在安全且隔离的环境中进行。无论您是想要测试 -Web 应用程序的开发人员、寻求安全浏览体验的注重隐私的用户，还是只是想利用虚拟浏览器的便利性和灵活性，Neko 都是完美的解决方案。 - -| Application | AMD64 | ARM64 | ARMv7 | -|----------------------------------------------------------------------------------------------------|-------|-------|-------| -| [Firefox](https://neko.m1k1o.net/docs/v3/installation/docker-images#firefox) | ✅ | ✅ * | ✅ * | -| [Tor Browser](https://neko.m1k1o.net/docs/v3/installation/docker-images#tor-browser) | ✅ | ❌ | ❌ | -| [Waterfox](https://neko.m1k1o.net/docs/v3/installation/docker-images#waterfox) | ✅ | ❌ | ❌ | -| [Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#chromium) | ✅ | ✅ * | ✅ * | -| [Google Chrome](https://neko.m1k1o.net/docs/v3/installation/docker-images#google-chrome) | ✅ | ❌ | ❌ | -| [Ungoogled Chromium](https://neko.m1k1o.net/docs/v3/installation/docker-images#ungoogled-chromium) | ✅ | ❌ | ❌ | -| [Microsoft Edge](https://neko.m1k1o.net/docs/v3/installation/docker-images#microsoft-edge) | ✅ | ❌ | ❌ | -| [Brave](https://neko.m1k1o.net/docs/v3/installation/docker-images#brave) | ✅ | ✅ * | ❌ | -| [Vivaldi](https://neko.m1k1o.net/docs/v3/installation/docker-images#vivaldi) | ✅ | ✅ * | ✅ * | -| [Opera](https://neko.m1k1o.net/docs/v3/installation/docker-images#opera) | ✅ | ❌ | ❌ | -| [Xfce](https://neko.m1k1o.net/docs/v3/installation/docker-images#xfce) | ✅ | ✅ | ✅ | -| [KDE](https://neko.m1k1o.net/docs/v3/installation/docker-images#kde) | ✅ | ✅ | ✅ | -| [Remmina](https://neko.m1k1o.net/docs/v3/installation/docker-images#remmina) | ✅ | ✅ | ✅ | -| [VLC](https://neko.m1k1o.net/docs/v3/installation/docker-images#vlc) | ✅ | ✅ | ✅ | - -> `*` No DRM support. - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/neko-xfce/data.yml b/apps/neko-xfce/data.yml deleted file mode 100644 index f03cbcbaf..000000000 --- a/apps/neko-xfce/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: neko-xfce - name: Neko (Xface轻量桌面环境) - tags: - - WebSite - - Local - shortDescZh: 虚拟浏览器 - shortDescEn: Virtual Browser - type: website - crossVersionUpdate: true - limit: 0 - website: https://neko.m1k1o.net/ - github: https://github.com/m1k1o/neko/ - document: https://neko.m1k1o.net/ diff --git a/apps/neko-xfce/logo.png b/apps/neko-xfce/logo.png deleted file mode 100644 index 8c2eed340..000000000 Binary files a/apps/neko-xfce/logo.png and /dev/null differ diff --git a/apps/neko/latest/data.yml b/apps/neko/latest/data.yml index 4937414ee..4d8dafedd 100644 --- a/apps/neko/latest/data.yml +++ b/apps/neko/latest/data.yml @@ -8,40 +8,32 @@ additionalProperties: required: true type: select values: - - label: "m1k1o/neko:kde" + - label: "KDE Plasma" value: "m1k1o/neko:kde" - - label: "m1k1o/neko:chromium" + - label: "Chromium" value: "m1k1o/neko:chromium" - - label: "m1k1o/neko:vivaldi" + - label: "Vivaldi" value: "m1k1o/neko:vivaldi" - - label: "m1k1o/neko:microsoft-edge" + - label: "Microsoft Edge" value: "m1k1o/neko:microsoft-edge" - - label: "m1k1o/neko:brave" + - label: "Brave" value: "m1k1o/neko:brave" - - label: "m1k1o/neko:tor-browser" + - label: "Tor Browser" value: "m1k1o/neko:tor-browser" - - label: "m1k1o/neko:ungoogled-chromium" + - label: "Ungoogled Chromium" value: "m1k1o/neko:ungoogled-chromium" - - label: "m1k1o/neko:google-chrome" + - label: "Google Chrome" value: "m1k1o/neko:google-chrome" - - label: "m1k1o/neko:firefox" + - label: "Firefox" value: "m1k1o/neko:firefox" - - label: "m1k1o/neko:vlc" + - label: "VLC" value: "m1k1o/neko:vlc" - - label: "m1k1o/neko:xfce" + - label: "Xfce" value: "m1k1o/neko:xfce" - - label: "m1k1o/neko:base" + - label: "Base Image" value: "m1k1o/neko:base" - - label: "m1k1o/neko:opera" + - label: "Opera" value: "m1k1o/neko:opera" - - label: "m1k1o/neko:vncviewer" - value: "m1k1o/neko:vncviewer" - - label: "m1k1o/neko:arm-firefox" - value: "m1k1o/neko:arm-firefox" - - label: "m1k1o/neko:arm-chromium" - value: "m1k1o/neko:arm-chromium" - - label: "m1k1o/neko:arm-base" - value: "m1k1o/neko:arm-base" - default: "40277" edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/nexus3/3.83.1-alpine/data.yml b/apps/nexus3/3.83.1-alpine/data.yml index 59fccd8ea..5c5d9015e 100644 --- a/apps/nexus3/3.83.1-alpine/data.yml +++ b/apps/nexus3/3.83.1-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/nexus3" + - default: "./data" edit: true envKey: NEXUS3_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/nexus3/3.83.1-alpine/docker-compose.yml b/apps/nexus3/3.83.1-alpine/docker-compose.yml index ccd091d29..b03904d20 100644 --- a/apps/nexus3/3.83.1-alpine/docker-compose.yml +++ b/apps/nexus3/3.83.1-alpine/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nexus3: - image: sonatype/nexus3:3.83.1-alpine + image: sonatype/nexus3:3.83.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8081 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NEXUS3_ROOT_PATH}/data:/nexus-data environment: diff --git a/apps/nexus3/3.83.1-alpine/envs/default.env b/apps/nexus3/3.83.1-alpine/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nexus3/3.83.1-alpine/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nexus3/3.83.1-alpine/envs/global.env b/apps/nexus3/3.83.1-alpine/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nexus3/3.83.1-alpine/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nexus3/3.83.1-alpine/scripts/init.sh b/apps/nexus3/3.83.1-alpine/scripts/init.sh index 68fa5dc45..58bf3b2e9 100644 --- a/apps/nexus3/3.83.1-alpine/scripts/init.sh +++ b/apps/nexus3/3.83.1-alpine/scripts/init.sh @@ -3,13 +3,6 @@ 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 - mkdir -p "$NEXUS3_ROOT_PATH" mkdir -p "$NEXUS3_ROOT_PATH/data" diff --git a/apps/nexus3/3.83.1-alpine/scripts/uninstall.sh b/apps/nexus3/3.83.1-alpine/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nexus3/3.83.1-alpine/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nexus3/3.83.1-alpine/scripts/upgrade.sh b/apps/nexus3/3.83.1-alpine/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nexus3/3.83.1-alpine/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/nexusphp/1.8.16/data.yml b/apps/nexusphp/1.8.16/data.yml index 3293ee6a6..623a0d5de 100644 --- a/apps/nexusphp/1.8.16/data.yml +++ b/apps/nexusphp/1.8.16/data.yml @@ -1,27 +1,27 @@ additionalProperties: formFields: - - default: "/home/nexusphp" + - default: "./data" edit: true envKey: NEXUSPHP_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text - - default: "/home/nexusphp" + - default: "./torrents" edit: true envKey: NEXUSPHP_TORRENTS_ROOT_PATH labelZh: 种子目录 labelEn: Torrent persistence path required: true type: text - - default: "/home/nexusphp" + - default: "./bitbucket" edit: true envKey: NEXUSPHP_BITBUCKET_ROOT_PATH labelZh: 上传器目录 labelEn: Uploader persistence path required: true type: text - - default: "/home/nexusphp" + - default: "./attachments" edit: true envKey: NEXUSPHP_ATTACHMENTS_ROOT_PATH labelZh: 附件目录 diff --git a/apps/nexusphp/1.8.16/docker-compose.yml b/apps/nexusphp/1.8.16/docker-compose.yml index 0a6fe9a58..252c5f8bc 100644 --- a/apps/nexusphp/1.8.16/docker-compose.yml +++ b/apps/nexusphp/1.8.16/docker-compose.yml @@ -13,12 +13,9 @@ 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: - ${NEXUSPHP_ROOT_PATH}/config/.env.example:/var/www/html/.env.example - ${NEXUSPHP_ROOT_PATH}/data:/var/www/html - - ${NEXUSPHP_TORRENTS_ROOT_PATH}/torrents:/var/www/html/torrents - - ${NEXUSPHP_BITBUCKET_ROOT_PATH}/bitbucket:/var/www/html/bitbucket - - ${NEXUSPHP_ATTACHMENTS_ROOT_PATH}/attachments:/var/www/html/attachments + - ${NEXUSPHP_TORRENTS_ROOT_PATH}:/var/www/html/torrents + - ${NEXUSPHP_BITBUCKET_ROOT_PATH}:/var/www/html/bitbucket + - ${NEXUSPHP_ATTACHMENTS_ROOT_PATH}:/var/www/html/attachments diff --git a/apps/nexusphp/1.8.16/envs/default.env b/apps/nexusphp/1.8.16/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nexusphp/1.8.16/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nexusphp/1.8.16/envs/global.env b/apps/nexusphp/1.8.16/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nexusphp/1.8.16/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nexusphp/1.8.16/scripts/init.sh b/apps/nexusphp/1.8.16/scripts/init.sh index 9a8966d38..a2ebdbb18 100644 --- a/apps/nexusphp/1.8.16/scripts/init.sh +++ b/apps/nexusphp/1.8.16/scripts/init.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 download geoip2 GEOIP_DIR="$NEXUSPHP_ROOT_PATH/geoip2" mkdir -p "$GEOIP_DIR" @@ -21,7 +13,6 @@ if [ -f .env ]; then echo "Error: Failed to download GeoIP2 database." fi - # setup-3 copy env file CONFIG_DIR="$NEXUSPHP_ROOT_PATH/config" mkdir -p "$CONFIG_DIR" diff --git a/apps/nexusphp/1.8.16/scripts/uninstall.sh b/apps/nexusphp/1.8.16/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nexusphp/1.8.16/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nexusphp/1.8.16/scripts/upgrade.sh b/apps/nexusphp/1.8.16/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nexusphp/1.8.16/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/nezha-dash/2.9.10/envs/default.env b/apps/nezha-dash/2.9.10/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nezha-dash/2.9.10/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nezha-dash/2.9.10/envs/global.env b/apps/nezha-dash/2.9.10/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nezha-dash/2.9.10/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nezha-dash/2.9.10/scripts/init.sh b/apps/nezha-dash/2.9.10/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nezha-dash/2.9.10/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/nezha-dash/2.9.10/scripts/uninstall.sh b/apps/nezha-dash/2.9.10/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nezha-dash/2.9.10/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nezha-dash/2.9.10/scripts/upgrade.sh b/apps/nezha-dash/2.9.10/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nezha-dash/2.9.10/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/nezha/0.20.13/data.yml b/apps/nezha/0.20.13/data.yml index 3d6fca204..034ff8268 100644 --- a/apps/nezha/0.20.13/data.yml +++ b/apps/nezha/0.20.13/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/nezha" + - default: "./data" edit: true envKey: NEZHA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/nezha/0.20.13/envs/default.env b/apps/nezha/0.20.13/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nezha/0.20.13/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nezha/0.20.13/envs/global.env b/apps/nezha/0.20.13/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nezha/0.20.13/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nezha/0.20.13/scripts/uninstall.sh b/apps/nezha/0.20.13/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nezha/0.20.13/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nezha/0.20.13/scripts/upgrade.sh b/apps/nezha/0.20.13/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nezha/0.20.13/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nginx-ui/2.1.17/data.yml b/apps/nginx-ui/2.1.17/data.yml index abd7b3c93..5e979a9f3 100644 --- a/apps/nginx-ui/2.1.17/data.yml +++ b/apps/nginx-ui/2.1.17/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/nginx-ui" + - default: "./data" edit: true envKey: NGINX_UI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/nginx-ui/2.1.17/docker-compose.yml b/apps/nginx-ui/2.1.17/docker-compose.yml index 4ec29d4f3..c16b696f1 100644 --- a/apps/nginx-ui/2.1.17/docker-compose.yml +++ b/apps/nginx-ui/2.1.17/docker-compose.yml @@ -15,9 +15,6 @@ services: ports: - ${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: - ${NGINX_UI_ROOT_PATH}/nginx:/etc/nginx - ${NGINX_UI_ROOT_PATH}/nginx-ui:/etc/nginx-ui diff --git a/apps/nginx-ui/2.1.17/envs/default.env b/apps/nginx-ui/2.1.17/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nginx-ui/2.1.17/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nginx-ui/2.1.17/envs/global.env b/apps/nginx-ui/2.1.17/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nginx-ui/2.1.17/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nginx-ui/2.1.17/scripts/init.sh b/apps/nginx-ui/2.1.17/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nginx-ui/2.1.17/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/nginx-ui/2.1.17/scripts/uninstall.sh b/apps/nginx-ui/2.1.17/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nginx-ui/2.1.17/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nginx-ui/2.1.17/scripts/upgrade.sh b/apps/nginx-ui/2.1.17/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nginx-ui/2.1.17/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/nocodb/0.264.6/data.yml b/apps/nocodb/0.264.6/data.yml index c1a535743..e2f3f0335 100644 --- a/apps/nocodb/0.264.6/data.yml +++ b/apps/nocodb/0.264.6/data.yml @@ -21,7 +21,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/nocodb" + - default: "./data" edit: true envKey: NOCODB_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/nocodb/0.264.6/docker-compose.yml b/apps/nocodb/0.264.6/docker-compose.yml index 855688795..6b49aad5f 100644 --- a/apps/nocodb/0.264.6/docker-compose.yml +++ b/apps/nocodb/0.264.6/docker-compose.yml @@ -12,9 +12,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NOCODB_ROOT_PATH}/data:/usr/app/data environment: diff --git a/apps/nocodb/0.264.6/envs/default.env b/apps/nocodb/0.264.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nocodb/0.264.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nocodb/0.264.6/envs/global.env b/apps/nocodb/0.264.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nocodb/0.264.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nocodb/0.264.6/scripts/init.sh b/apps/nocodb/0.264.6/scripts/init.sh deleted file mode 100644 index 118f924a3..000000000 --- a/apps/nocodb/0.264.6/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nocodb/0.264.6/scripts/uninstall.sh b/apps/nocodb/0.264.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nocodb/0.264.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nocodb/0.264.6/scripts/upgrade.sh b/apps/nocodb/0.264.6/scripts/upgrade.sh deleted file mode 100644 index 84793ac8a..000000000 --- a/apps/nocodb/0.264.6/scripts/upgrade.sh +++ /dev/null @@ -1,18 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." -else - echo "Error: .env file not found." -fi diff --git a/apps/nodebb/4.4.5/docker-compose.yml b/apps/nodebb/4.4.5/docker-compose.yml index 6f289f232..9889b32fe 100644 --- a/apps/nodebb/4.4.5/docker-compose.yml +++ b/apps/nodebb/4.4.5/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:4567 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NODEBB_ROOT_PATH}/node_modules:/usr/src/app/node_modules - ${NODEBB_ROOT_PATH}/build:/usr/src/app/build diff --git a/apps/nodebb/4.4.5/envs/default.env b/apps/nodebb/4.4.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nodebb/4.4.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nodebb/4.4.5/envs/global.env b/apps/nodebb/4.4.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nodebb/4.4.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nodebb/4.4.5/scripts/init.sh b/apps/nodebb/4.4.5/scripts/init.sh index 00b4605fb..b5a2d7a7d 100644 --- a/apps/nodebb/4.4.5/scripts/init.sh +++ b/apps/nodebb/4.4.5/scripts/init.sh @@ -3,21 +3,12 @@ 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 - - # setup-2 update dir permissions mkdir -p "$NODEBB_ROOT_PATH" mkdir -p "$NODEBB_ROOT_PATH/node_modules" mkdir -p "$NODEBB_ROOT_PATH/build" mkdir -p "$NODEBB_ROOT_PATH/uploads" mkdir -p "$NODEBB_ROOT_PATH/config" - # setup-3 初始化参数配置 if [ -z "$NODEBB_DB_NAME" ]; then NODEBB_DB_NAME="nodebb" fi @@ -42,7 +33,6 @@ if [ -f .env ]; then " "$SETUP_JSON_PATH" - # setup-4 update dir permissions chown -R 1001:1001 "$NODEBB_ROOT_PATH" chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules" chown -R 1001:1001 "$NODEBB_ROOT_PATH/build" diff --git a/apps/nodebb/4.4.5/scripts/uninstall.sh b/apps/nodebb/4.4.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nodebb/4.4.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nodebb/4.4.5/scripts/upgrade.sh b/apps/nodebb/4.4.5/scripts/upgrade.sh index 6cdcf1744..5da0f6d14 100644 --- a/apps/nodebb/4.4.5/scripts/upgrade.sh +++ b/apps/nodebb/4.4.5/scripts/upgrade.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 update dir permissions mkdir -p "$NODEBB_ROOT_PATH" mkdir -p "$NODEBB_ROOT_PATH/node_modules" mkdir -p "$NODEBB_ROOT_PATH/build" @@ -30,7 +22,6 @@ if [ -f .env ]; then " "$SETUP_JSON_PATH" fi - # setup-3 update dir permissions chown -R 1001:1001 "$NODEBB_ROOT_PATH" chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules" chown -R 1001:1001 "$NODEBB_ROOT_PATH/build" diff --git a/apps/nodebb/latest/docker-compose.yml b/apps/nodebb/latest/docker-compose.yml index ad81dee51..7a8ea7f32 100644 --- a/apps/nodebb/latest/docker-compose.yml +++ b/apps/nodebb/latest/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:4567 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NODEBB_ROOT_PATH}/node_modules:/usr/src/app/node_modules - ${NODEBB_ROOT_PATH}/build:/usr/src/app/build diff --git a/apps/nodebb/latest/envs/default.env b/apps/nodebb/latest/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nodebb/latest/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nodebb/latest/envs/global.env b/apps/nodebb/latest/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nodebb/latest/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nodebb/latest/scripts/init.sh b/apps/nodebb/latest/scripts/init.sh index 00b4605fb..b5a2d7a7d 100644 --- a/apps/nodebb/latest/scripts/init.sh +++ b/apps/nodebb/latest/scripts/init.sh @@ -3,21 +3,12 @@ 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 - - # setup-2 update dir permissions mkdir -p "$NODEBB_ROOT_PATH" mkdir -p "$NODEBB_ROOT_PATH/node_modules" mkdir -p "$NODEBB_ROOT_PATH/build" mkdir -p "$NODEBB_ROOT_PATH/uploads" mkdir -p "$NODEBB_ROOT_PATH/config" - # setup-3 初始化参数配置 if [ -z "$NODEBB_DB_NAME" ]; then NODEBB_DB_NAME="nodebb" fi @@ -42,7 +33,6 @@ if [ -f .env ]; then " "$SETUP_JSON_PATH" - # setup-4 update dir permissions chown -R 1001:1001 "$NODEBB_ROOT_PATH" chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules" chown -R 1001:1001 "$NODEBB_ROOT_PATH/build" diff --git a/apps/nodebb/latest/scripts/uninstall.sh b/apps/nodebb/latest/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nodebb/latest/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nodebb/latest/scripts/upgrade.sh b/apps/nodebb/latest/scripts/upgrade.sh index 6cdcf1744..5da0f6d14 100644 --- a/apps/nodebb/latest/scripts/upgrade.sh +++ b/apps/nodebb/latest/scripts/upgrade.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 update dir permissions mkdir -p "$NODEBB_ROOT_PATH" mkdir -p "$NODEBB_ROOT_PATH/node_modules" mkdir -p "$NODEBB_ROOT_PATH/build" @@ -30,7 +22,6 @@ if [ -f .env ]; then " "$SETUP_JSON_PATH" fi - # setup-3 update dir permissions chown -R 1001:1001 "$NODEBB_ROOT_PATH" chown -R 1001:1001 "$NODEBB_ROOT_PATH/node_modules" chown -R 1001:1001 "$NODEBB_ROOT_PATH/build" diff --git a/apps/nodepassdash/2.2.1/data.yml b/apps/nodepassdash/2.2.1/data.yml index ad4bc5870..41a5378ce 100644 --- a/apps/nodepassdash/2.2.1/data.yml +++ b/apps/nodepassdash/2.2.1/data.yml @@ -1,22 +1,6 @@ additionalProperties: formFields: - - default: "host" - edit: true - envKey: NETWORK_MODE - labelZh: 网络模式 - labelEn: Network mode - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - - default: "/home/nodepassdash" + - default: "./data" edit: true envKey: NODEPASSDASH_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/nodepassdash/2.2.1/docker-compose.yml b/apps/nodepassdash/2.2.1/docker-compose.yml index a355bc310..62e4d6d50 100644 --- a/apps/nodepassdash/2.2.1/docker-compose.yml +++ b/apps/nodepassdash/2.2.1/docker-compose.yml @@ -9,12 +9,10 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NODEPASSDASH_ROOT_PATH}/logs:/app/logs - ${NODEPASSDASH_ROOT_PATH}/public:/app/public diff --git a/apps/nodepassdash/2.2.1/envs/default.env b/apps/nodepassdash/2.2.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/nodepassdash/2.2.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/nodepassdash/2.2.1/envs/global.env b/apps/nodepassdash/2.2.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/nodepassdash/2.2.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/nodepassdash/2.2.1/scripts/init.sh b/apps/nodepassdash/2.2.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nodepassdash/2.2.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/nodepassdash/2.2.1/scripts/uninstall.sh b/apps/nodepassdash/2.2.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/nodepassdash/2.2.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/nodepassdash/2.2.1/scripts/upgrade.sh b/apps/nodepassdash/2.2.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/nodepassdash/2.2.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/ollama/0.11.8/data.yml b/apps/ollama/0.11.8/data.yml index 5ba0061cc..1a7f4655c 100644 --- a/apps/ollama/0.11.8/data.yml +++ b/apps/ollama/0.11.8/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/ollama" + - default: "./data" edit: true envKey: OLLAMA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/ollama/0.11.8/docker-compose.yml b/apps/ollama/0.11.8/docker-compose.yml index 61f22659f..c7fdde6c4 100644 --- a/apps/ollama/0.11.8/docker-compose.yml +++ b/apps/ollama/0.11.8/docker-compose.yml @@ -24,9 +24,6 @@ services: # - /dev/video11:/dev/video11 ports: - ${PANEL_APP_PORT_HTTP}:11434 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${OLLAMA_ROOT_PATH}/data:/root/.ollama environment: diff --git a/apps/ollama/0.11.8/envs/default.env b/apps/ollama/0.11.8/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ollama/0.11.8/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ollama/0.11.8/envs/global.env b/apps/ollama/0.11.8/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ollama/0.11.8/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ollama/0.11.8/scripts/init.sh b/apps/ollama/0.11.8/scripts/init.sh deleted file mode 100644 index 118f924a3..000000000 --- a/apps/ollama/0.11.8/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ollama/0.11.8/scripts/uninstall.sh b/apps/ollama/0.11.8/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ollama/0.11.8/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ollama/0.11.8/scripts/upgrade.sh b/apps/ollama/0.11.8/scripts/upgrade.sh deleted file mode 100644 index 84793ac8a..000000000 --- a/apps/ollama/0.11.8/scripts/upgrade.sh +++ /dev/null @@ -1,18 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." -else - echo "Error: .env file not found." -fi diff --git a/apps/onedev/12.0.8/envs/default.env b/apps/onedev/12.0.8/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/onedev/12.0.8/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/onedev/12.0.8/envs/global.env b/apps/onedev/12.0.8/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/onedev/12.0.8/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/onedev/12.0.8/envs/onedev.env b/apps/onedev/12.0.8/envs/onedev.env deleted file mode 100644 index 134c16ddc..000000000 --- a/apps/onedev/12.0.8/envs/onedev.env +++ /dev/null @@ -1,29 +0,0 @@ -# 外部数据库支持配置 - -# PostgreSQL -# hibernate_dialect=io.onedev.server.persistence.PostgreSQLDialect -# hibernate_connection_driver_class=org.postgresql.Driver -# hibernate_connection_url=jdbc:postgresql://localhost:5432/onedev -# hibernate_connection_username=postgres -# hibernate_connection_password=postgres - -# MySQL -# hibernate_dialect=org.hibernate.dialect.MySQL5InnoDBDialect -# hibernate_connection_driver_class=com.mysql.cj.jdbc.Driver -# hibernate_connection_url=jdbc:mysql://localhost:3306/onedev?serverTimezone=UTC&allowPublicKeyRetrieval=true&useSSL=false&disableMariaDbDriver=true -# hibernate_connection_username=root -# hibernate_connection_password=root - -# MariaDB -# hibernate_dialect=org.hibernate.dialect.MySQL5InnoDBDialect -# hibernate_connection_driver_class=org.mariadb.jdbc.Driver -# hibernate_connection_url=jdbc:mariadb://localhost:3306/onedev -# hibernate_connection_username=root -# hibernate_connection_password=root - -# MS SQL Server -# hibernate_dialect=org.hibernate.dialect.SQLServer2012Dialect -# hibernate_connection_driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver -# hibernate_connection_url=jdbc:sqlserver://localhost:1433;databaseName=onedev -# hibernate_connection_username=sa -# hibernate_connection_password=sa diff --git a/apps/onedev/12.0.8/scripts/init.sh b/apps/onedev/12.0.8/scripts/init.sh deleted file mode 100644 index 118f924a3..000000000 --- a/apps/onedev/12.0.8/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/onedev/12.0.8/scripts/uninstall.sh b/apps/onedev/12.0.8/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/onedev/12.0.8/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/onedev/12.0.8/scripts/upgrade.sh b/apps/onedev/12.0.8/scripts/upgrade.sh deleted file mode 100644 index 84793ac8a..000000000 --- a/apps/onedev/12.0.8/scripts/upgrade.sh +++ /dev/null @@ -1,18 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env - - echo "Check Finish." -else - echo "Error: .env file not found." -fi diff --git a/apps/open-webui/0.6.26/data.yml b/apps/open-webui/0.6.26/data.yml index 3c87483a6..b87d7cb6d 100644 --- a/apps/open-webui/0.6.26/data.yml +++ b/apps/open-webui/0.6.26/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/open-webui" + - default: "./data" edit: true envKey: OPEN_WEBUI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/open-webui/0.6.26/docker-compose.yml b/apps/open-webui/0.6.26/docker-compose.yml index b6b7388e5..0bf17e210 100644 --- a/apps/open-webui/0.6.26/docker-compose.yml +++ b/apps/open-webui/0.6.26/docker-compose.yml @@ -23,9 +23,6 @@ services: # - /dev/video11:/dev/video11 ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${OPEN_WEBUI_ROOT_PATH}/data:/app/backend/data environment: diff --git a/apps/open-webui/0.6.26/envs/default.env b/apps/open-webui/0.6.26/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/open-webui/0.6.26/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/open-webui/0.6.26/envs/global.env b/apps/open-webui/0.6.26/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/open-webui/0.6.26/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/open-webui/0.6.26/scripts/init.sh b/apps/open-webui/0.6.26/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/open-webui/0.6.26/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/open-webui/0.6.26/scripts/uninstall.sh b/apps/open-webui/0.6.26/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/open-webui/0.6.26/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/open-webui/0.6.26/scripts/upgrade.sh b/apps/open-webui/0.6.26/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/open-webui/0.6.26/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/openfire/4.9.2/envs/default.env b/apps/openfire/4.9.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/openfire/4.9.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/openfire/4.9.2/envs/global.env b/apps/openfire/4.9.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/openfire/4.9.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/openfire/4.9.2/scripts/init.sh b/apps/openfire/4.9.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/openfire/4.9.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/openfire/4.9.2/scripts/uninstall.sh b/apps/openfire/4.9.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/openfire/4.9.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/openfire/4.9.2/scripts/upgrade.sh b/apps/openfire/4.9.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/openfire/4.9.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/openfire/4.9.2/data.yml b/apps/openfire/5.0.1/data.yml similarity index 96% rename from apps/openfire/4.9.2/data.yml rename to apps/openfire/5.0.1/data.yml index 3a75c5e58..156f32f36 100644 --- a/apps/openfire/4.9.2/data.yml +++ b/apps/openfire/5.0.1/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/openfire" + - default: "./data" edit: true envKey: OPENFIRE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/openfire/4.9.2/docker-compose.yml b/apps/openfire/5.0.1/docker-compose.yml similarity index 75% rename from apps/openfire/4.9.2/docker-compose.yml rename to apps/openfire/5.0.1/docker-compose.yml index 2d85fdd61..8625c16ab 100644 --- a/apps/openfire/4.9.2/docker-compose.yml +++ b/apps/openfire/5.0.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: openfire: - image: nasqueron/openfire:4.9.2 + image: ghcr.io/igniterealtime/openfire:v5.0.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -16,9 +16,6 @@ services: - ${PANEL_APP_PORT_WSS}:9091 - ${PANEL_APP_PORT_SERVER}:5222 - ${PANEL_APP_PORT_MESSAGE}:7777 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${OPENFIRE_ROOT_PATH}/data:/var/lib/openfire - ${OPENFIRE_ROOT_PATH}/logs:/var/log/openfire diff --git a/apps/openresty-manager/2.0.0/data.yml b/apps/openresty-manager/2.0.0/data.yml index ba53928f1..e5247800f 100644 --- a/apps/openresty-manager/2.0.0/data.yml +++ b/apps/openresty-manager/2.0.0/data.yml @@ -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: 数据持久化路径 diff --git a/apps/openresty-manager/2.0.0/docker-compose.yml b/apps/openresty-manager/2.0.0/docker-compose.yml index 29547da85..7721df00a 100644 --- a/apps/openresty-manager/2.0.0/docker-compose.yml +++ b/apps/openresty-manager/2.0.0/docker-compose.yml @@ -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 diff --git a/apps/openresty-manager/2.0.0/envs/default.env b/apps/openresty-manager/2.0.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/openresty-manager/2.0.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/openresty-manager/2.0.0/envs/global.env b/apps/openresty-manager/2.0.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/openresty-manager/2.0.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/openresty-manager/2.0.0/scripts/init.sh b/apps/openresty-manager/2.0.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/openresty-manager/2.0.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/openresty-manager/2.0.0/scripts/uninstall.sh b/apps/openresty-manager/2.0.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/openresty-manager/2.0.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/openresty-manager/2.0.0/scripts/upgrade.sh b/apps/openresty-manager/2.0.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/openresty-manager/2.0.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/outline/0.86.1/data.yml b/apps/outline/0.86.1/data.yml index c2e78f0e1..b70556db9 100644 --- a/apps/outline/0.86.1/data.yml +++ b/apps/outline/0.86.1/data.yml @@ -28,7 +28,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/outline" + - default: "./data" edit: true envKey: OUTLINE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/outline/0.86.1/docker-compose.yml b/apps/outline/0.86.1/docker-compose.yml index 29aea35f7..402132fcd 100644 --- a/apps/outline/0.86.1/docker-compose.yml +++ b/apps/outline/0.86.1/docker-compose.yml @@ -16,8 +16,6 @@ services: volumes: - ${OUTLINE_ROOT_PATH}/data:/var/lib/outline/data env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/outline/outline.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - ./env/outline.env environment: - DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} diff --git a/apps/outline/0.86.1/envs/default.env b/apps/outline/0.86.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/outline/0.86.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/outline/0.86.1/envs/global.env b/apps/outline/0.86.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/outline/0.86.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/outline/0.86.1/scripts/init.sh b/apps/outline/0.86.1/scripts/init.sh index 4c7fbfcb7..7ccef56ac 100644 --- a/apps/outline/0.86.1/scripts/init.sh +++ b/apps/outline/0.86.1/scripts/init.sh @@ -3,19 +3,8 @@ 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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env - - # setup-2 remove empty values sed -i '/^.*=""/d' .env - # setup-3 update directory permissions mkdir -p "$OUTLINE_ROOT_PATH" mkdir -p "$OUTLINE_ROOT_PATH/data" diff --git a/apps/outline/0.86.1/scripts/uninstall.sh b/apps/outline/0.86.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/outline/0.86.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/outline/0.86.1/scripts/upgrade.sh b/apps/outline/0.86.1/scripts/upgrade.sh index 4c7fbfcb7..7ccef56ac 100644 --- a/apps/outline/0.86.1/scripts/upgrade.sh +++ b/apps/outline/0.86.1/scripts/upgrade.sh @@ -3,19 +3,8 @@ 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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env - - # setup-2 remove empty values sed -i '/^.*=""/d' .env - # setup-3 update directory permissions mkdir -p "$OUTLINE_ROOT_PATH" mkdir -p "$OUTLINE_ROOT_PATH/data" diff --git a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/data.yml b/apps/overseerr/1.34.0/data.yml similarity index 92% rename from apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/data.yml rename to apps/overseerr/1.34.0/data.yml index 3e55c85f6..9de8544fb 100644 --- a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/data.yml +++ b/apps/overseerr/1.34.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/overseerr" + - default: "./data" edit: true envKey: OVERSEERR_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/docker-compose.yml b/apps/overseerr/1.34.0/docker-compose.yml similarity index 67% rename from apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/docker-compose.yml rename to apps/overseerr/1.34.0/docker-compose.yml index 0a4d941e2..95ba9dfb5 100644 --- a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/docker-compose.yml +++ b/apps/overseerr/1.34.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: overseerr: - image: sctx/overseerr:c2d4c61fae2053157052f96e5de1cdb490ea704e + image: sctx/overseerr:1.34.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5055 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${OVERSEERR_ROOT_PATH}/config:/app/config environment: diff --git a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/envs/default.env b/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/envs/global.env b/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/init.sh b/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/uninstall.sh b/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/upgrade.sh b/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/overseerr/c2d4c61fae2053157052f96e5de1cdb490ea704e/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/page-spy-web/2.4.0/data.yml b/apps/page-spy-web/2.4.0/data.yml index aff2e78d4..8f86a3c80 100644 --- a/apps/page-spy-web/2.4.0/data.yml +++ b/apps/page-spy-web/2.4.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/PageSpy" + - default: "./data" edit: true envKey: PAGE_SPY_WEB_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/page-spy-web/2.4.0/docker-compose.yml b/apps/page-spy-web/2.4.0/docker-compose.yml index acccaceed..33cb27d1d 100644 --- a/apps/page-spy-web/2.4.0/docker-compose.yml +++ b/apps/page-spy-web/2.4.0/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:6752 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PAGE_SPY_WEB_ROOT_PATH}/log:/app/log - ${PAGE_SPY_WEB_ROOT_PATH}/data:/app/data diff --git a/apps/page-spy-web/2.4.0/envs/default.env b/apps/page-spy-web/2.4.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/page-spy-web/2.4.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/page-spy-web/2.4.0/envs/global.env b/apps/page-spy-web/2.4.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/page-spy-web/2.4.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/page-spy-web/2.4.0/scripts/init.sh b/apps/page-spy-web/2.4.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/page-spy-web/2.4.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/page-spy-web/2.4.0/scripts/uninstall.sh b/apps/page-spy-web/2.4.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/page-spy-web/2.4.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/page-spy-web/2.4.0/scripts/upgrade.sh b/apps/page-spy-web/2.4.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/page-spy-web/2.4.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/paopao-ce/0.5.2/data.yml b/apps/paopao-ce/0.5.2/data.yml index cd0931420..2c5f631b9 100644 --- a/apps/paopao-ce/0.5.2/data.yml +++ b/apps/paopao-ce/0.5.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/paopao-ce" + - default: "./data" edit: true envKey: PAOPAO_CE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/paopao-ce/0.5.2/docker-compose.yml b/apps/paopao-ce/0.5.2/docker-compose.yml index 18020840b..670fc09a6 100644 --- a/apps/paopao-ce/0.5.2/docker-compose.yml +++ b/apps/paopao-ce/0.5.2/docker-compose.yml @@ -5,6 +5,25 @@ networks: driver: bridge services: + paopao-ce: + image: bitbus/paopao-ce:0.5.2 + container_name: ${CONTAINER_NAME} + depends_on: + - paopao-db + - paopao-redis + - paopao-meili + labels: + createdBy: "Apps" + networks: + - 1panel-network + - paopao-network + restart: always + ports: + - ${PANEL_APP_PORT_HTTP}:8008 + volumes: + - ${PAOPAO_CE_ROOT_PATH}/config/config.yaml:/app/paopao-ce/config.yaml + - ${PAOPAO_CE_ROOT_PATH}/custom:/app/paopao-ce/custom + paopao-db: image: mysql:${MYSQL_TAG:-8.0} networks: @@ -46,25 +65,3 @@ services: - ${PAOPAO_CE_ROOT_PATH}/meili_data:/meili_data environment: - MEILI_MASTER_KEY=${MEILI_MASTER_KEY:-paopao-meilisearch} - - paopao-ce: - image: bitbus/paopao-ce:0.5.2 - container_name: ${CONTAINER_NAME} - depends_on: - - paopao-db - - paopao-redis - - paopao-meili - labels: - createdBy: "Apps" - networks: - - 1panel-network - - paopao-network - restart: always - ports: - - ${PANEL_APP_PORT_HTTP}:8008 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ${PAOPAO_CE_ROOT_PATH}/config/config.yaml:/app/paopao-ce/config.yaml - - ${PAOPAO_CE_ROOT_PATH}/custom:/app/paopao-ce/custom diff --git a/apps/paopao-ce/0.5.2/envs/default.env b/apps/paopao-ce/0.5.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/paopao-ce/0.5.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/paopao-ce/0.5.2/envs/global.env b/apps/paopao-ce/0.5.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/paopao-ce/0.5.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/paopao-ce/0.5.2/scripts/init.sh b/apps/paopao-ce/0.5.2/scripts/init.sh index 651c2bda0..a9f1cb115 100644 --- a/apps/paopao-ce/0.5.2/scripts/init.sh +++ b/apps/paopao-ce/0.5.2/scripts/init.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 copy config file mkdir -p "$PAOPAO_CE_ROOT_PATH" mkdir -p "$PAOPAO_CE_ROOT_PATH/config" mkdir -p "$PAOPAO_CE_ROOT_PATH/scripts" diff --git a/apps/paopao-ce/0.5.2/scripts/uninstall.sh b/apps/paopao-ce/0.5.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/paopao-ce/0.5.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/paopao-ce/0.5.2/scripts/upgrade.sh b/apps/paopao-ce/0.5.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/paopao-ce/0.5.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/peer-ban-helper/8.0.12/data.yml b/apps/peer-ban-helper/8.0.12/data.yml index b13f18729..f1012ded3 100644 --- a/apps/peer-ban-helper/8.0.12/data.yml +++ b/apps/peer-ban-helper/8.0.12/data.yml @@ -1,22 +1,6 @@ additionalProperties: formFields: - - default: "1panel-network" - edit: true - envKey: NETWORK_MODE - labelZh: 网络模式 - labelEn: Network mode - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - - default: "/home/peerbanhelper" + - default: "./data" edit: true envKey: PEERBANHELPER_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/peer-ban-helper/8.0.12/docker-compose.yml b/apps/peer-ban-helper/8.0.12/docker-compose.yml index c486a65e4..ea0480400 100644 --- a/apps/peer-ban-helper/8.0.12/docker-compose.yml +++ b/apps/peer-ban-helper/8.0.12/docker-compose.yml @@ -9,12 +9,10 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE:-host} + network_mode: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:9898 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PEERBANHELPER_ROOT_PATH}/app:/app/data environment: diff --git a/apps/peer-ban-helper/8.0.12/envs/default.env b/apps/peer-ban-helper/8.0.12/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/peer-ban-helper/8.0.12/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/peer-ban-helper/8.0.12/envs/global.env b/apps/peer-ban-helper/8.0.12/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/peer-ban-helper/8.0.12/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/peer-ban-helper/8.0.12/scripts/init.sh b/apps/peer-ban-helper/8.0.12/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/peer-ban-helper/8.0.12/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/peer-ban-helper/8.0.12/scripts/uninstall.sh b/apps/peer-ban-helper/8.0.12/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/peer-ban-helper/8.0.12/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/peer-ban-helper/8.0.12/scripts/upgrade.sh b/apps/peer-ban-helper/8.0.12/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/peer-ban-helper/8.0.12/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/percona/8.0/data.yml b/apps/percona/8.0/data.yml index 787019e9a..7cc07fc64 100644 --- a/apps/percona/8.0/data.yml +++ b/apps/percona/8.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/percona" + - default: "./data" edit: true envKey: PERCONA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/percona/8.0/docker-compose.yml b/apps/percona/8.0/docker-compose.yml index 91d9b6eed..0f8c03c2a 100644 --- a/apps/percona/8.0/docker-compose.yml +++ b/apps/percona/8.0/docker-compose.yml @@ -14,9 +14,6 @@ services: user: ${UID:-1000}:${GID:-1000} ports: - ${PANEL_APP_PORT_HTTP}:3306 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PERCONA_ROOT_PATH}/data:/var/lib/mysql - ${PERCONA_ROOT_PATH}/config/my.cnf:/etc/my.cnf diff --git a/apps/percona/8.0/envs/default.env b/apps/percona/8.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/percona/8.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/percona/8.0/envs/global.env b/apps/percona/8.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/percona/8.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/percona/8.0/scripts/init.sh b/apps/percona/8.0/scripts/init.sh index ae47f700c..22e1ee048 100644 --- a/apps/percona/8.0/scripts/init.sh +++ b/apps/percona/8.0/scripts/init.sh @@ -3,13 +3,6 @@ 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 - mkdir -p "$PERCONA_ROOT_PATH" mkdir -p "$PERCONA_ROOT_PATH/config" mkdir -p "$PERCONA_ROOT_PATH/data" diff --git a/apps/percona/8.0/scripts/uninstall.sh b/apps/percona/8.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/percona/8.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/percona/8.0/scripts/upgrade.sh b/apps/percona/8.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/percona/8.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/photoprism/250707/docker-compose.yml b/apps/photoprism/250707/docker-compose.yml index c4cee0d51..d5467daf9 100644 --- a/apps/photoprism/250707/docker-compose.yml +++ b/apps/photoprism/250707/docker-compose.yml @@ -29,9 +29,7 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/photoprism/photoprism.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - /envs/photoprism.env volumes: - ${PHOTOPRISM_ROOT_PATH}/originals:/photoprism/originals - ${PHOTOPRISM_ROOT_PATH}/storage:/photoprism/storage diff --git a/apps/photoprism/250707/envs/default.env b/apps/photoprism/250707/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/photoprism/250707/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/photoprism/250707/envs/global.env b/apps/photoprism/250707/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/photoprism/250707/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/photoprism/250707/scripts/init.sh b/apps/photoprism/250707/scripts/init.sh deleted file mode 100644 index b762dc6b0..000000000 --- a/apps/photoprism/250707/scripts/init.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/photoprism.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/photoprism/250707/scripts/uninstall.sh b/apps/photoprism/250707/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/photoprism/250707/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/photoprism/250707/scripts/upgrade.sh b/apps/photoprism/250707/scripts/upgrade.sh deleted file mode 100644 index b762dc6b0..000000000 --- a/apps/photoprism/250707/scripts/upgrade.sh +++ /dev/null @@ -1,19 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/photoprism.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pi-hole-dhcp/2025.08.0/data.yml b/apps/pi-hole-dhcp/2025.08.0/data.yml index 419bd4716..b5d5c477b 100644 --- a/apps/pi-hole-dhcp/2025.08.0/data.yml +++ b/apps/pi-hole-dhcp/2025.08.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/pihole" + - default: "./data" edit: true envKey: PIHOLE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/pi-hole-dhcp/2025.08.0/docker-compose.yml b/apps/pi-hole-dhcp/2025.08.0/docker-compose.yml index 20ce3c6fb..760f8737d 100644 --- a/apps/pi-hole-dhcp/2025.08.0/docker-compose.yml +++ b/apps/pi-hole-dhcp/2025.08.0/docker-compose.yml @@ -17,9 +17,6 @@ services: - 53 - 53/udp - ${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PIHOLE_ROOT_PATH}/pihole:/etc/pihole - ${PIHOLE_ROOT_PATH}/dnsmasq.d:/etc/dnsmasq.d diff --git a/apps/pi-hole-dhcp/2025.08.0/envs/default.env b/apps/pi-hole-dhcp/2025.08.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/pi-hole-dhcp/2025.08.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/pi-hole-dhcp/2025.08.0/envs/global.env b/apps/pi-hole-dhcp/2025.08.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/pi-hole-dhcp/2025.08.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/pi-hole-dhcp/2025.08.0/scripts/init.sh b/apps/pi-hole-dhcp/2025.08.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/pi-hole-dhcp/2025.08.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/pi-hole-dhcp/2025.08.0/scripts/uninstall.sh b/apps/pi-hole-dhcp/2025.08.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/pi-hole-dhcp/2025.08.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pi-hole-dhcp/2025.08.0/scripts/upgrade.sh b/apps/pi-hole-dhcp/2025.08.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/pi-hole-dhcp/2025.08.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/pi-hole/2025.08.0/data.yml b/apps/pi-hole/2025.08.0/data.yml index 056e3eb86..eca8c29a1 100644 --- a/apps/pi-hole/2025.08.0/data.yml +++ b/apps/pi-hole/2025.08.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/pihole" + - default: "./data" edit: true envKey: PIHOLE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/pi-hole/2025.08.0/docker-compose.yml b/apps/pi-hole/2025.08.0/docker-compose.yml index edadac89a..de74e3e7f 100644 --- a/apps/pi-hole/2025.08.0/docker-compose.yml +++ b/apps/pi-hole/2025.08.0/docker-compose.yml @@ -15,9 +15,6 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_DNS}:53 - ${PANEL_APP_PORT_DNS}:53/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PIHOLE_ROOT_PATH}/pihole:/etc/pihole - ${PIHOLE_ROOT_PATH}/dnsmasq.d:/etc/dnsmasq.d diff --git a/apps/pi-hole/2025.08.0/envs/default.env b/apps/pi-hole/2025.08.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/pi-hole/2025.08.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/pi-hole/2025.08.0/envs/global.env b/apps/pi-hole/2025.08.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/pi-hole/2025.08.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/pi-hole/2025.08.0/scripts/init.sh b/apps/pi-hole/2025.08.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/pi-hole/2025.08.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/pi-hole/2025.08.0/scripts/uninstall.sh b/apps/pi-hole/2025.08.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/pi-hole/2025.08.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pi-hole/2025.08.0/scripts/upgrade.sh b/apps/pi-hole/2025.08.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/pi-hole/2025.08.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/pingvin-share/1.13.0/envs/default.env b/apps/pingvin-share/1.13.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/pingvin-share/1.13.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/pingvin-share/1.13.0/envs/global.env b/apps/pingvin-share/1.13.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/pingvin-share/1.13.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/pingvin-share/1.13.0/scripts/init.sh b/apps/pingvin-share/1.13.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/pingvin-share/1.13.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/pingvin-share/1.13.0/scripts/uninstall.sh b/apps/pingvin-share/1.13.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/pingvin-share/1.13.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pingvin-share/1.13.0/scripts/upgrade.sh b/apps/pingvin-share/1.13.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/pingvin-share/1.13.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/pixman/1.8.2/data.yml b/apps/pixman/1.8.2/data.yml index 2edb4e676..d1e019f1f 100644 --- a/apps/pixman/1.8.2/data.yml +++ b/apps/pixman/1.8.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/pixman" + - default: "./data" edit: true envKey: PIXMAN_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/pixman/1.8.2/docker-compose.yml b/apps/pixman/1.8.2/docker-compose.yml index 2a280d4ba..537758acd 100644 --- a/apps/pixman/1.8.2/docker-compose.yml +++ b/apps/pixman/1.8.2/docker-compose.yml @@ -12,9 +12,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PIXMAN_ROOT_PATH}/m3u:/app/app/data/m3u environment: diff --git a/apps/pixman/1.8.2/envs/default.env b/apps/pixman/1.8.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/pixman/1.8.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/pixman/1.8.2/envs/global.env b/apps/pixman/1.8.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/pixman/1.8.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/pixman/1.8.2/scripts/init.sh b/apps/pixman/1.8.2/scripts/init.sh index a33a4a556..3db0c4eb2 100644 --- a/apps/pixman/1.8.2/scripts/init.sh +++ b/apps/pixman/1.8.2/scripts/init.sh @@ -3,13 +3,6 @@ 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 - if [ ! -d $PIXMAN_ROOT_PATH/m3u ]; then mkdir -p $PIXMAN_ROOT_PATH/m3u fi diff --git a/apps/pixman/1.8.2/scripts/uninstall.sh b/apps/pixman/1.8.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/pixman/1.8.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pixman/1.8.2/scripts/upgrade.sh b/apps/pixman/1.8.2/scripts/upgrade.sh index a33a4a556..3db0c4eb2 100644 --- a/apps/pixman/1.8.2/scripts/upgrade.sh +++ b/apps/pixman/1.8.2/scripts/upgrade.sh @@ -3,13 +3,6 @@ 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 - if [ ! -d $PIXMAN_ROOT_PATH/m3u ]; then mkdir -p $PIXMAN_ROOT_PATH/m3u fi diff --git a/apps/plex/1.42.1/envs/default.env b/apps/plex/1.42.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/plex/1.42.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/plex/1.42.1/envs/global.env b/apps/plex/1.42.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/plex/1.42.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/plex/1.42.1/scripts/init.sh b/apps/plex/1.42.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/plex/1.42.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/plex/1.42.1/scripts/uninstall.sh b/apps/plex/1.42.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/plex/1.42.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/plex/1.42.1/scripts/upgrade.sh b/apps/plex/1.42.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/plex/1.42.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/policr-mini/latest/data.yml b/apps/policr-mini/20250731/data.yml similarity index 98% rename from apps/policr-mini/latest/data.yml rename to apps/policr-mini/20250731/data.yml index 9bd382f6c..801f30725 100644 --- a/apps/policr-mini/latest/data.yml +++ b/apps/policr-mini/20250731/data.yml @@ -14,7 +14,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/policr-mini" + - default: "./data" edit: true envKey: POLICR_MINI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/policr-mini/latest/docker-compose.yml b/apps/policr-mini/20250731/docker-compose.yml similarity index 91% rename from apps/policr-mini/latest/docker-compose.yml rename to apps/policr-mini/20250731/docker-compose.yml index bb1641586..b6a7587f5 100644 --- a/apps/policr-mini/latest/docker-compose.yml +++ b/apps/policr-mini/20250731/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: policr-mini: - image: gramoss/policr-mini:latest + image: gramoss/policr-mini:20250731 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POLICR_MINI_ROOT_PATH}/assets:/_assets environment: diff --git a/apps/policr-mini/latest/envs/default.env b/apps/policr-mini/latest/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/policr-mini/latest/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/policr-mini/latest/envs/global.env b/apps/policr-mini/latest/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/policr-mini/latest/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/policr-mini/latest/scripts/init.sh b/apps/policr-mini/latest/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/policr-mini/latest/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/policr-mini/latest/scripts/uninstall.sh b/apps/policr-mini/latest/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/policr-mini/latest/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/policr-mini/latest/scripts/upgrade.sh b/apps/policr-mini/latest/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/policr-mini/latest/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql-postgis/16-3.5-alpine/data.yml b/apps/postgresql-postgis/16-3.5-alpine/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql-postgis/16-3.5-alpine/data.yml +++ b/apps/postgresql-postgis/16-3.5-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql-postgis/16-3.5-alpine/docker-compose.yml b/apps/postgresql-postgis/16-3.5-alpine/docker-compose.yml index 6bce54c5f..79f47bf0a 100644 --- a/apps/postgresql-postgis/16-3.5-alpine/docker-compose.yml +++ b/apps/postgresql-postgis/16-3.5-alpine/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql-postgis/16-3.5-alpine/envs/default.env b/apps/postgresql-postgis/16-3.5-alpine/envs/default.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5-alpine/envs/global.env b/apps/postgresql-postgis/16-3.5-alpine/envs/global.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5-alpine/scripts/init.sh b/apps/postgresql-postgis/16-3.5-alpine/scripts/init.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5-alpine/scripts/uninstall.sh b/apps/postgresql-postgis/16-3.5-alpine/scripts/uninstall.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5-alpine/scripts/upgrade.sh b/apps/postgresql-postgis/16-3.5-alpine/scripts/upgrade.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5/data.yml b/apps/postgresql-postgis/16-3.5/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql-postgis/16-3.5/data.yml +++ b/apps/postgresql-postgis/16-3.5/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql-postgis/16-3.5/docker-compose.yml b/apps/postgresql-postgis/16-3.5/docker-compose.yml index c0647f0af..6a3ae1a5b 100644 --- a/apps/postgresql-postgis/16-3.5/docker-compose.yml +++ b/apps/postgresql-postgis/16-3.5/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql-postgis/16-3.5/envs/default.env b/apps/postgresql-postgis/16-3.5/envs/default.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5/envs/global.env b/apps/postgresql-postgis/16-3.5/envs/global.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5/scripts/init.sh b/apps/postgresql-postgis/16-3.5/scripts/init.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5/scripts/uninstall.sh b/apps/postgresql-postgis/16-3.5/scripts/uninstall.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/16-3.5/scripts/upgrade.sh b/apps/postgresql-postgis/16-3.5/scripts/upgrade.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5-alpine/data.yml b/apps/postgresql-postgis/17-3.5-alpine/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql-postgis/17-3.5-alpine/data.yml +++ b/apps/postgresql-postgis/17-3.5-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql-postgis/17-3.5-alpine/docker-compose.yml b/apps/postgresql-postgis/17-3.5-alpine/docker-compose.yml index 97af1b5a0..5028e8244 100644 --- a/apps/postgresql-postgis/17-3.5-alpine/docker-compose.yml +++ b/apps/postgresql-postgis/17-3.5-alpine/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql-postgis/17-3.5-alpine/envs/default.env b/apps/postgresql-postgis/17-3.5-alpine/envs/default.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5-alpine/envs/global.env b/apps/postgresql-postgis/17-3.5-alpine/envs/global.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5-alpine/scripts/init.sh b/apps/postgresql-postgis/17-3.5-alpine/scripts/init.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5-alpine/scripts/uninstall.sh b/apps/postgresql-postgis/17-3.5-alpine/scripts/uninstall.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5-alpine/scripts/upgrade.sh b/apps/postgresql-postgis/17-3.5-alpine/scripts/upgrade.sh deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5/data.yml b/apps/postgresql-postgis/17-3.5/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql-postgis/17-3.5/data.yml +++ b/apps/postgresql-postgis/17-3.5/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql-postgis/17-3.5/docker-compose.yml b/apps/postgresql-postgis/17-3.5/docker-compose.yml index 8a761fda1..660d5c42c 100644 --- a/apps/postgresql-postgis/17-3.5/docker-compose.yml +++ b/apps/postgresql-postgis/17-3.5/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql-postgis/17-3.5/envs/default.env b/apps/postgresql-postgis/17-3.5/envs/default.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5/envs/global.env b/apps/postgresql-postgis/17-3.5/envs/global.env deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/postgresql-postgis/17-3.5/scripts/init.sh b/apps/postgresql-postgis/17-3.5/scripts/init.sh deleted file mode 100644 index 4c7fbfcb7..000000000 --- a/apps/postgresql-postgis/17-3.5/scripts/init.sh +++ /dev/null @@ -1,29 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env - - # setup-2 remove empty values - sed -i '/^.*=""/d' .env - - # setup-3 update directory permissions - mkdir -p "$OUTLINE_ROOT_PATH" - mkdir -p "$OUTLINE_ROOT_PATH/data" - - chown -R 1001:1001 "$OUTLINE_ROOT_PATH" - chmod -R 1777 "$OUTLINE_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql-postgis/17-3.5/scripts/uninstall.sh b/apps/postgresql-postgis/17-3.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql-postgis/17-3.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql-postgis/17-3.5/scripts/upgrade.sh b/apps/postgresql-postgis/17-3.5/scripts/upgrade.sh deleted file mode 100644 index 4c7fbfcb7..000000000 --- a/apps/postgresql-postgis/17-3.5/scripts/upgrade.sh +++ /dev/null @@ -1,29 +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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env - - # setup-2 remove empty values - sed -i '/^.*=""/d' .env - - # setup-3 update directory permissions - mkdir -p "$OUTLINE_ROOT_PATH" - mkdir -p "$OUTLINE_ROOT_PATH/data" - - chown -R 1001:1001 "$OUTLINE_ROOT_PATH" - chmod -R 1777 "$OUTLINE_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/16.9-alpine/data.yml b/apps/postgresql/16.9-alpine/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/16.9-alpine/data.yml +++ b/apps/postgresql/16.9-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/16.9-alpine/docker-compose.yml b/apps/postgresql/16.9-alpine/docker-compose.yml index 558e1ca29..742b8bc49 100644 --- a/apps/postgresql/16.9-alpine/docker-compose.yml +++ b/apps/postgresql/16.9-alpine/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/16.9-alpine/envs/default.env b/apps/postgresql/16.9-alpine/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/16.9-alpine/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/16.9-alpine/envs/global.env b/apps/postgresql/16.9-alpine/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/16.9-alpine/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/16.9-alpine/scripts/init.sh b/apps/postgresql/16.9-alpine/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/16.9-alpine/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/16.9-alpine/scripts/uninstall.sh b/apps/postgresql/16.9-alpine/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/16.9-alpine/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/16.9-alpine/scripts/upgrade.sh b/apps/postgresql/16.9-alpine/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/16.9-alpine/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/16.9/data.yml b/apps/postgresql/16.9/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/16.9/data.yml +++ b/apps/postgresql/16.9/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/16.9/docker-compose.yml b/apps/postgresql/16.9/docker-compose.yml index f8ce136d9..e29a971b5 100644 --- a/apps/postgresql/16.9/docker-compose.yml +++ b/apps/postgresql/16.9/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/16.9/envs/default.env b/apps/postgresql/16.9/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/16.9/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/16.9/envs/global.env b/apps/postgresql/16.9/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/16.9/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/16.9/scripts/init.sh b/apps/postgresql/16.9/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/16.9/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/16.9/scripts/uninstall.sh b/apps/postgresql/16.9/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/16.9/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/16.9/scripts/upgrade.sh b/apps/postgresql/16.9/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/16.9/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/17.5-alpine/data.yml b/apps/postgresql/17.5-alpine/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/17.5-alpine/data.yml +++ b/apps/postgresql/17.5-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/17.5-alpine/docker-compose.yml b/apps/postgresql/17.5-alpine/docker-compose.yml index 4e43e4086..9014f5656 100644 --- a/apps/postgresql/17.5-alpine/docker-compose.yml +++ b/apps/postgresql/17.5-alpine/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/17.5-alpine/envs/default.env b/apps/postgresql/17.5-alpine/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/17.5-alpine/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/17.5-alpine/envs/global.env b/apps/postgresql/17.5-alpine/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/17.5-alpine/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/17.5-alpine/scripts/init.sh b/apps/postgresql/17.5-alpine/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/17.5-alpine/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/17.5-alpine/scripts/uninstall.sh b/apps/postgresql/17.5-alpine/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/17.5-alpine/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/17.5-alpine/scripts/upgrade.sh b/apps/postgresql/17.5-alpine/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/17.5-alpine/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/17.5/data.yml b/apps/postgresql/17.5/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/17.5/data.yml +++ b/apps/postgresql/17.5/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/17.5/docker-compose.yml b/apps/postgresql/17.5/docker-compose.yml index 616c927f2..a633393db 100644 --- a/apps/postgresql/17.5/docker-compose.yml +++ b/apps/postgresql/17.5/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/17.5/envs/default.env b/apps/postgresql/17.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/17.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/17.5/envs/global.env b/apps/postgresql/17.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/17.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/17.5/scripts/init.sh b/apps/postgresql/17.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/17.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/17.5/scripts/uninstall.sh b/apps/postgresql/17.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/17.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/17.5/scripts/upgrade.sh b/apps/postgresql/17.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/17.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg14-alpine/data.yml b/apps/postgresql/pg14-alpine/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg14-alpine/data.yml +++ b/apps/postgresql/pg14-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg14-alpine/docker-compose.yml b/apps/postgresql/pg14-alpine/docker-compose.yml index 416ad6c68..6e8c7d185 100644 --- a/apps/postgresql/pg14-alpine/docker-compose.yml +++ b/apps/postgresql/pg14-alpine/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg14-alpine/envs/default.env b/apps/postgresql/pg14-alpine/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg14-alpine/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg14-alpine/envs/global.env b/apps/postgresql/pg14-alpine/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg14-alpine/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg14-alpine/scripts/init.sh b/apps/postgresql/pg14-alpine/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg14-alpine/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg14-alpine/scripts/uninstall.sh b/apps/postgresql/pg14-alpine/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg14-alpine/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg14-alpine/scripts/upgrade.sh b/apps/postgresql/pg14-alpine/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg14-alpine/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg14-vectors/data.yml b/apps/postgresql/pg14-vectors/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg14-vectors/data.yml +++ b/apps/postgresql/pg14-vectors/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg14-vectors/docker-compose.yml b/apps/postgresql/pg14-vectors/docker-compose.yml index 6925a6975..301857994 100644 --- a/apps/postgresql/pg14-vectors/docker-compose.yml +++ b/apps/postgresql/pg14-vectors/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg14-vectors/envs/default.env b/apps/postgresql/pg14-vectors/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg14-vectors/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg14-vectors/envs/global.env b/apps/postgresql/pg14-vectors/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg14-vectors/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg14-vectors/scripts/init.sh b/apps/postgresql/pg14-vectors/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg14-vectors/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg14-vectors/scripts/uninstall.sh b/apps/postgresql/pg14-vectors/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg14-vectors/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg14-vectors/scripts/upgrade.sh b/apps/postgresql/pg14-vectors/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg14-vectors/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg14/data.yml b/apps/postgresql/pg14/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg14/data.yml +++ b/apps/postgresql/pg14/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg14/docker-compose.yml b/apps/postgresql/pg14/docker-compose.yml index 5510b8e2e..e7c7429ca 100644 --- a/apps/postgresql/pg14/docker-compose.yml +++ b/apps/postgresql/pg14/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg14/envs/default.env b/apps/postgresql/pg14/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg14/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg14/envs/global.env b/apps/postgresql/pg14/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg14/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg14/scripts/init.sh b/apps/postgresql/pg14/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg14/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg14/scripts/uninstall.sh b/apps/postgresql/pg14/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg14/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg14/scripts/upgrade.sh b/apps/postgresql/pg14/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg14/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg15-alpine/data.yml b/apps/postgresql/pg15-alpine/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg15-alpine/data.yml +++ b/apps/postgresql/pg15-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg15-alpine/docker-compose.yml b/apps/postgresql/pg15-alpine/docker-compose.yml index cf4f24ca1..b123c8322 100644 --- a/apps/postgresql/pg15-alpine/docker-compose.yml +++ b/apps/postgresql/pg15-alpine/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg15-alpine/envs/default.env b/apps/postgresql/pg15-alpine/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg15-alpine/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg15-alpine/envs/global.env b/apps/postgresql/pg15-alpine/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg15-alpine/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg15-alpine/scripts/init.sh b/apps/postgresql/pg15-alpine/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg15-alpine/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg15-alpine/scripts/uninstall.sh b/apps/postgresql/pg15-alpine/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg15-alpine/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg15-alpine/scripts/upgrade.sh b/apps/postgresql/pg15-alpine/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg15-alpine/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg15-vectors/data.yml b/apps/postgresql/pg15-vectors/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg15-vectors/data.yml +++ b/apps/postgresql/pg15-vectors/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg15-vectors/docker-compose.yml b/apps/postgresql/pg15-vectors/docker-compose.yml index 5abb791dc..39651ce46 100644 --- a/apps/postgresql/pg15-vectors/docker-compose.yml +++ b/apps/postgresql/pg15-vectors/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg15-vectors/envs/default.env b/apps/postgresql/pg15-vectors/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg15-vectors/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg15-vectors/envs/global.env b/apps/postgresql/pg15-vectors/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg15-vectors/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg15-vectors/scripts/init.sh b/apps/postgresql/pg15-vectors/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg15-vectors/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg15-vectors/scripts/uninstall.sh b/apps/postgresql/pg15-vectors/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg15-vectors/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg15-vectors/scripts/upgrade.sh b/apps/postgresql/pg15-vectors/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg15-vectors/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg15/data.yml b/apps/postgresql/pg15/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg15/data.yml +++ b/apps/postgresql/pg15/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg15/docker-compose.yml b/apps/postgresql/pg15/docker-compose.yml index 17d11df83..6d4830ffb 100644 --- a/apps/postgresql/pg15/docker-compose.yml +++ b/apps/postgresql/pg15/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg15/envs/default.env b/apps/postgresql/pg15/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg15/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg15/envs/global.env b/apps/postgresql/pg15/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg15/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg15/scripts/init.sh b/apps/postgresql/pg15/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg15/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg15/scripts/uninstall.sh b/apps/postgresql/pg15/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg15/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg15/scripts/upgrade.sh b/apps/postgresql/pg15/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg15/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg16-alpine/data.yml b/apps/postgresql/pg16-alpine/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg16-alpine/data.yml +++ b/apps/postgresql/pg16-alpine/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg16-alpine/docker-compose.yml b/apps/postgresql/pg16-alpine/docker-compose.yml index 8ed2c2e67..c52dddd57 100644 --- a/apps/postgresql/pg16-alpine/docker-compose.yml +++ b/apps/postgresql/pg16-alpine/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg16-alpine/envs/default.env b/apps/postgresql/pg16-alpine/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg16-alpine/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg16-alpine/envs/global.env b/apps/postgresql/pg16-alpine/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg16-alpine/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg16-alpine/scripts/init.sh b/apps/postgresql/pg16-alpine/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg16-alpine/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg16-alpine/scripts/uninstall.sh b/apps/postgresql/pg16-alpine/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg16-alpine/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg16-alpine/scripts/upgrade.sh b/apps/postgresql/pg16-alpine/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg16-alpine/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg16-vectors/data.yml b/apps/postgresql/pg16-vectors/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg16-vectors/data.yml +++ b/apps/postgresql/pg16-vectors/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg16-vectors/docker-compose.yml b/apps/postgresql/pg16-vectors/docker-compose.yml index be4d7d9cb..3b1aac21e 100644 --- a/apps/postgresql/pg16-vectors/docker-compose.yml +++ b/apps/postgresql/pg16-vectors/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg16-vectors/envs/default.env b/apps/postgresql/pg16-vectors/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg16-vectors/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg16-vectors/envs/global.env b/apps/postgresql/pg16-vectors/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg16-vectors/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg16-vectors/scripts/init.sh b/apps/postgresql/pg16-vectors/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg16-vectors/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg16-vectors/scripts/uninstall.sh b/apps/postgresql/pg16-vectors/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg16-vectors/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg16-vectors/scripts/upgrade.sh b/apps/postgresql/pg16-vectors/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg16-vectors/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg16/data.yml b/apps/postgresql/pg16/data.yml index ac55698bd..b7fe98de7 100644 --- a/apps/postgresql/pg16/data.yml +++ b/apps/postgresql/pg16/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/postgres" + - default: "./data" edit: true envKey: POSTGRES_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/postgresql/pg16/docker-compose.yml b/apps/postgresql/pg16/docker-compose.yml index f186cdabc..b274d98ec 100644 --- a/apps/postgresql/pg16/docker-compose.yml +++ b/apps/postgresql/pg16/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:5432 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data environment: diff --git a/apps/postgresql/pg16/envs/default.env b/apps/postgresql/pg16/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/postgresql/pg16/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/postgresql/pg16/envs/global.env b/apps/postgresql/pg16/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/postgresql/pg16/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/postgresql/pg16/scripts/init.sh b/apps/postgresql/pg16/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg16/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/postgresql/pg16/scripts/uninstall.sh b/apps/postgresql/pg16/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/postgresql/pg16/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/postgresql/pg16/scripts/upgrade.sh b/apps/postgresql/pg16/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/postgresql/pg16/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/pro-api/latest/data.yml b/apps/pro-api/0.1.0/data.yml similarity index 100% rename from apps/pro-api/latest/data.yml rename to apps/pro-api/0.1.0/data.yml diff --git a/apps/pro-api/latest/docker-compose.yml b/apps/pro-api/0.1.0/docker-compose.yml similarity index 91% rename from apps/pro-api/latest/docker-compose.yml rename to apps/pro-api/0.1.0/docker-compose.yml index 270b52334..5d5adbc78 100644 --- a/apps/pro-api/latest/docker-compose.yml +++ b/apps/pro-api/0.1.0/docker-compose.yml @@ -1,6 +1,6 @@ services: pro-api: - image: duolabmeng/pro-api:latest + image: duolabmeng/pro-api:v0.1.0 container_name: ${CONTAINER_NAME} restart: always ports: diff --git a/apps/prowlarr/2.0.5/data.yml b/apps/prowlarr/2.0.5/data.yml index 0afacf0fd..290e2af85 100644 --- a/apps/prowlarr/2.0.5/data.yml +++ b/apps/prowlarr/2.0.5/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/prowlarr" + - default: "./data" edit: true envKey: PROWLARR_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/prowlarr/2.0.5/docker-compose.yml b/apps/prowlarr/2.0.5/docker-compose.yml index 6592823d5..446c13a07 100644 --- a/apps/prowlarr/2.0.5/docker-compose.yml +++ b/apps/prowlarr/2.0.5/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:9696 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PROWLARR_ROOT_PATH}/config:/config environment: diff --git a/apps/prowlarr/2.0.5/envs/default.env b/apps/prowlarr/2.0.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/prowlarr/2.0.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/prowlarr/2.0.5/envs/global.env b/apps/prowlarr/2.0.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/prowlarr/2.0.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/prowlarr/2.0.5/scripts/init.sh b/apps/prowlarr/2.0.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/prowlarr/2.0.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/prowlarr/2.0.5/scripts/uninstall.sh b/apps/prowlarr/2.0.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/prowlarr/2.0.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/prowlarr/2.0.5/scripts/upgrade.sh b/apps/prowlarr/2.0.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/prowlarr/2.0.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/puff/0.2.2/data.yml b/apps/puff/0.2.2/data.yml index 492027b7e..f30a6b447 100644 --- a/apps/puff/0.2.2/data.yml +++ b/apps/puff/0.2.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/puff" + - default: "./data" edit: true envKey: PUFF_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/puff/0.2.2/docker-compose.yml b/apps/puff/0.2.2/docker-compose.yml index cce843dde..4953e5913 100644 --- a/apps/puff/0.2.2/docker-compose.yml +++ b/apps/puff/0.2.2/docker-compose.yml @@ -13,8 +13,5 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PUFF_ROOT_PATH}/data:/app/data diff --git a/apps/puff/0.2.2/envs/default.env b/apps/puff/0.2.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/puff/0.2.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/puff/0.2.2/envs/global.env b/apps/puff/0.2.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/puff/0.2.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/puff/0.2.2/scripts/init.sh b/apps/puff/0.2.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/puff/0.2.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/puff/0.2.2/scripts/uninstall.sh b/apps/puff/0.2.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/puff/0.2.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/puff/0.2.2/scripts/upgrade.sh b/apps/puff/0.2.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/puff/0.2.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/qinglong/2.19.2/data.yml b/apps/qinglong/2.19.2/data.yml index b32ae486e..fcfac66ff 100644 --- a/apps/qinglong/2.19.2/data.yml +++ b/apps/qinglong/2.19.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/qinglong" + - default: "./data" edit: true envKey: QINGLONG_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/qinglong/2.19.2/envs/default.env b/apps/qinglong/2.19.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/qinglong/2.19.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/qinglong/2.19.2/envs/global.env b/apps/qinglong/2.19.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/qinglong/2.19.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/qinglong/2.19.2/scripts/init.sh b/apps/qinglong/2.19.2/scripts/init.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/qinglong/2.19.2/scripts/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/qinglong/2.19.2/scripts/uninstall.sh b/apps/qinglong/2.19.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/qinglong/2.19.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/qinglong/2.19.2/scripts/upgrade.sh b/apps/qinglong/2.19.2/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/qinglong/2.19.2/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/radarr/5.26.2/envs/default.env b/apps/radarr/5.26.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/radarr/5.26.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/radarr/5.26.2/envs/global.env b/apps/radarr/5.26.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/radarr/5.26.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/radarr/5.26.2/scripts/init.sh b/apps/radarr/5.26.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/radarr/5.26.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/radarr/5.26.2/scripts/uninstall.sh b/apps/radarr/5.26.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/radarr/5.26.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/radarr/5.26.2/scripts/upgrade.sh b/apps/radarr/5.26.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/radarr/5.26.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/readeck-pg/0.19.2/data.yml b/apps/readeck-pg/0.19.2/data.yml index 709f5e154..38170311f 100644 --- a/apps/readeck-pg/0.19.2/data.yml +++ b/apps/readeck-pg/0.19.2/data.yml @@ -14,7 +14,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/readeck" + - default: "./data" edit: true envKey: READECK_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/readeck-pg/0.19.2/docker-compose.yml b/apps/readeck-pg/0.19.2/docker-compose.yml index db3606eeb..e6d1ca1a3 100644 --- a/apps/readeck-pg/0.19.2/docker-compose.yml +++ b/apps/readeck-pg/0.19.2/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} healthcheck: test: [ "CMD", "/bin/readeck", "healthcheck", "-config", "config.toml" ] interval: 30s diff --git a/apps/readeck-pg/0.19.2/envs/default.env b/apps/readeck-pg/0.19.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/readeck-pg/0.19.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/readeck-pg/0.19.2/envs/global.env b/apps/readeck-pg/0.19.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/readeck-pg/0.19.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/readeck-pg/0.19.2/scripts/init.sh b/apps/readeck-pg/0.19.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/readeck-pg/0.19.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/readeck-pg/0.19.2/scripts/uninstall.sh b/apps/readeck-pg/0.19.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/readeck-pg/0.19.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/readeck-pg/0.19.2/scripts/upgrade.sh b/apps/readeck-pg/0.19.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/readeck-pg/0.19.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/readeck/0.19.2/data.yml b/apps/readeck/0.19.2/data.yml index 2b7ed5322..2d3128ba9 100644 --- a/apps/readeck/0.19.2/data.yml +++ b/apps/readeck/0.19.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/readeck" + - default: "./data" edit: true envKey: READECK_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/readeck/0.19.2/docker-compose.yml b/apps/readeck/0.19.2/docker-compose.yml index 79476dd1e..fe0fc7af4 100644 --- a/apps/readeck/0.19.2/docker-compose.yml +++ b/apps/readeck/0.19.2/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} healthcheck: test: [ "CMD", "/bin/readeck", "healthcheck", "-config", "config.toml" ] interval: 30s diff --git a/apps/readeck/0.19.2/envs/default.env b/apps/readeck/0.19.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/readeck/0.19.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/readeck/0.19.2/envs/global.env b/apps/readeck/0.19.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/readeck/0.19.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/readeck/0.19.2/scripts/init.sh b/apps/readeck/0.19.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/readeck/0.19.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/readeck/0.19.2/scripts/uninstall.sh b/apps/readeck/0.19.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/readeck/0.19.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/readeck/0.19.2/scripts/upgrade.sh b/apps/readeck/0.19.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/readeck/0.19.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/reader3-webview/3.2.0/docker-compose.yml b/apps/reader3-webview/3.2.0/docker-compose.yml index e1082b550..506d3a619 100644 --- a/apps/reader3-webview/3.2.0/docker-compose.yml +++ b/apps/reader3-webview/3.2.0/docker-compose.yml @@ -13,5 +13,3 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8050 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} diff --git a/apps/reader3-webview/3.2.0/envs/default.env b/apps/reader3-webview/3.2.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/reader3-webview/3.2.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/reader3-webview/3.2.0/envs/global.env b/apps/reader3-webview/3.2.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/reader3-webview/3.2.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/reader3-webview/3.2.0/scripts/init.sh b/apps/reader3-webview/3.2.0/scripts/init.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/reader3-webview/3.2.0/scripts/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/reader3-webview/3.2.0/scripts/uninstall.sh b/apps/reader3-webview/3.2.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/reader3-webview/3.2.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/reader3-webview/3.2.0/scripts/upgrade.sh b/apps/reader3-webview/3.2.0/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/reader3-webview/3.2.0/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/reader3/3.2.14/data.yml b/apps/reader3/3.2.14/data.yml index fcf52b044..1611dae12 100644 --- a/apps/reader3/3.2.14/data.yml +++ b/apps/reader3/3.2.14/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/reader3" + - default: "./data" edit: true envKey: READER3_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/reader3/3.2.14/docker-compose.yml b/apps/reader3/3.2.14/docker-compose.yml index 3aab37f0f..8c76f5f16 100644 --- a/apps/reader3/3.2.14/docker-compose.yml +++ b/apps/reader3/3.2.14/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${READER3_ROOT_PATH}/logs:/logs - ${READER3_ROOT_PATH}/storage:/storage diff --git a/apps/reader3/3.2.14/envs/default.env b/apps/reader3/3.2.14/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/reader3/3.2.14/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/reader3/3.2.14/envs/global.env b/apps/reader3/3.2.14/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/reader3/3.2.14/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/reader3/3.2.14/scripts/init.sh b/apps/reader3/3.2.14/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/reader3/3.2.14/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/reader3/3.2.14/scripts/uninstall.sh b/apps/reader3/3.2.14/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/reader3/3.2.14/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/reader3/3.2.14/scripts/upgrade.sh b/apps/reader3/3.2.14/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/reader3/3.2.14/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/redis/6.2.18/data.yml b/apps/redis/6.2.18/data.yml index fcf9b51d8..10c3dfea3 100644 --- a/apps/redis/6.2.18/data.yml +++ b/apps/redis/6.2.18/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/redis" + - default: "./data" envKey: REDIS_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path diff --git a/apps/redis/6.2.18/envs/default.env b/apps/redis/6.2.18/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/redis/6.2.18/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/redis/6.2.18/envs/global.env b/apps/redis/6.2.18/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/redis/6.2.18/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/redis/6.2.18/scripts/uninstall.sh b/apps/redis/6.2.18/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/redis/6.2.18/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/redis/6.2.18/scripts/upgrade.sh b/apps/redis/6.2.18/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/redis/6.2.18/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/redis/7.4.4/data.yml b/apps/redis/7.4.4/data.yml index fcf9b51d8..10c3dfea3 100644 --- a/apps/redis/7.4.4/data.yml +++ b/apps/redis/7.4.4/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/redis" + - default: "./data" envKey: REDIS_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path diff --git a/apps/redis/7.4.4/envs/default.env b/apps/redis/7.4.4/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/redis/7.4.4/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/redis/7.4.4/envs/global.env b/apps/redis/7.4.4/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/redis/7.4.4/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/redis/7.4.4/scripts/uninstall.sh b/apps/redis/7.4.4/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/redis/7.4.4/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/redis/7.4.4/scripts/upgrade.sh b/apps/redis/7.4.4/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/redis/7.4.4/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/rsshub/2025-07-01/docker-compose.yml b/apps/rsshub/2025-07-01/docker-compose.yml index 523a976e6..21ae90984 100644 --- a/apps/rsshub/2025-07-01/docker-compose.yml +++ b/apps/rsshub/2025-07-01/docker-compose.yml @@ -15,9 +15,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:1200 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - NODE_ENV=production - PUPPETEER_WS_ENDPOINT=ws://browserless:3000 diff --git a/apps/rsshub/2025-07-01/envs/default.env b/apps/rsshub/2025-07-01/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/rsshub/2025-07-01/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/rsshub/2025-07-01/envs/global.env b/apps/rsshub/2025-07-01/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/rsshub/2025-07-01/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/rsshub/2025-07-01/scripts/init.sh b/apps/rsshub/2025-07-01/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/rsshub/2025-07-01/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/rsshub/2025-07-01/scripts/uninstall.sh b/apps/rsshub/2025-07-01/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/rsshub/2025-07-01/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/rsshub/2025-07-01/scripts/upgrade.sh b/apps/rsshub/2025-07-01/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/rsshub/2025-07-01/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/rustdesk-api/2.6.27/data.yml b/apps/rustdesk-api/2.6.27/data.yml index 59692032e..c12a650f2 100644 --- a/apps/rustdesk-api/2.6.27/data.yml +++ b/apps/rustdesk-api/2.6.27/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/rustdesk-api" + - default: "./data" edit: true envKey: RUSTDESK_API_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/rustdesk-api/2.6.27/docker-compose.yml b/apps/rustdesk-api/2.6.27/docker-compose.yml index 03e1cdb27..e23f1e072 100644 --- a/apps/rustdesk-api/2.6.27/docker-compose.yml +++ b/apps/rustdesk-api/2.6.27/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:21114 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${RUSTDESK_API_ROOT_PATH}/data:/data environment: @@ -40,13 +37,10 @@ services: - 21117:21117 - 21118:21118 - 21119:21119 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${RUSTDESK_API_ROOT_PATH}/data:/data - - ${HBBR_RUN_FILE:-./conf/hbbr/run}:/etc/s6-overlay/s6-rc.d/hbbr/run - - ${HBBS_RUN_FILE:-./conf/hbbs/run}:/etc/s6-overlay/s6-rc.d/hbbs/run + - ./conf/hbbr/run:/etc/s6-overlay/s6-rc.d/hbbr/run + - ./conf/hbbs/run:/etc/s6-overlay/s6-rc.d/hbbs/run environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN diff --git a/apps/rustdesk-api/2.6.27/envs/default.env b/apps/rustdesk-api/2.6.27/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/rustdesk-api/2.6.27/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/rustdesk-api/2.6.27/envs/global.env b/apps/rustdesk-api/2.6.27/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/rustdesk-api/2.6.27/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/rustdesk-api/2.6.27/scripts/init.sh b/apps/rustdesk-api/2.6.27/scripts/init.sh deleted file mode 100644 index b7348b2f5..000000000 --- a/apps/rustdesk-api/2.6.27/scripts/init.sh +++ /dev/null @@ -1,19 +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 "HBBR_RUN_FILE=${CURRENT_DIR}/conf/hbbr/run" >> .env - echo "HBBS_RUN_FILE=${CURRENT_DIR}/conf/hbbs/run" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/rustdesk-api/2.6.27/scripts/uninstall.sh b/apps/rustdesk-api/2.6.27/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/rustdesk-api/2.6.27/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/rustdesk-api/2.6.27/scripts/upgrade.sh b/apps/rustdesk-api/2.6.27/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/rustdesk-api/2.6.27/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/rustfs/latest/data.yml b/apps/rustfs/latest/data.yml index 41e89e557..b35f9ad12 100644 --- a/apps/rustfs/latest/data.yml +++ b/apps/rustfs/latest/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/rustfs" + - default: "./data" edit: true envKey: RUSTFS_ROOT_PATH labelZh: 数据持久化路径 @@ -48,24 +48,3 @@ additionalProperties: value: "true" - label: 禁用 value: "false" - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/rustfs/latest/docker-compose.yml b/apps/rustfs/latest/docker-compose.yml index bf4915ddd..bbd693b7f 100644 --- a/apps/rustfs/latest/docker-compose.yml +++ b/apps/rustfs/latest/docker-compose.yml @@ -13,14 +13,8 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:9000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${RUSTFS_ROOT_PATH}/data:/etc/rustfs - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} environment: - TZ=Asia/Shanghai - RUSTFS_ADDRESS=:9000 diff --git a/apps/rustfs/latest/envs/default.env b/apps/rustfs/latest/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/rustfs/latest/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/rustfs/latest/envs/global.env b/apps/rustfs/latest/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/rustfs/latest/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/rustfs/latest/scripts/init.sh b/apps/rustfs/latest/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/rustfs/latest/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/rustfs/latest/scripts/uninstall.sh b/apps/rustfs/latest/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/rustfs/latest/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/rustfs/latest/scripts/upgrade.sh b/apps/rustfs/latest/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/rustfs/latest/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/s-ui/1.3.2/data.yml b/apps/s-ui/1.3.2/data.yml index c158f106d..3a025a278 100644 --- a/apps/s-ui/1.3.2/data.yml +++ b/apps/s-ui/1.3.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/s-ui" + - default: "./data" edit: true envKey: S_UI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/s-ui/1.3.2/docker-compose.yml b/apps/s-ui/1.3.2/docker-compose.yml index 902748c63..9b87ee4b3 100644 --- a/apps/s-ui/1.3.2/docker-compose.yml +++ b/apps/s-ui/1.3.2/docker-compose.yml @@ -15,9 +15,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2095 - ${PANEL_APP_PORT_API}:2096 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${S_UI_ROOT_PATH}/db:/app/db - ${S_UI_ROOT_PATH}/cert:/app/cert diff --git a/apps/s-ui/1.3.2/envs/default.env b/apps/s-ui/1.3.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/s-ui/1.3.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/s-ui/1.3.2/envs/global.env b/apps/s-ui/1.3.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/s-ui/1.3.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/s-ui/1.3.2/scripts/init.sh b/apps/s-ui/1.3.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/s-ui/1.3.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/s-ui/1.3.2/scripts/uninstall.sh b/apps/s-ui/1.3.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/s-ui/1.3.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/s-ui/1.3.2/scripts/upgrade.sh b/apps/s-ui/1.3.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/s-ui/1.3.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/seaweedfs/3.96/data.yml b/apps/seaweedfs/3.96/data.yml index fd2e8aa51..33f1b9428 100644 --- a/apps/seaweedfs/3.96/data.yml +++ b/apps/seaweedfs/3.96/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/seaweedfs" + - default: "./data" edit: true envKey: SEAWEEDFS_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/seaweedfs/3.96/docker-compose.yml b/apps/seaweedfs/3.96/docker-compose.yml index 1b4613e36..45befba67 100644 --- a/apps/seaweedfs/3.96/docker-compose.yml +++ b/apps/seaweedfs/3.96/docker-compose.yml @@ -15,9 +15,6 @@ services: - ${PANEL_APP_PORT_MASTER_API}:19333 - ${PANEL_APP_PORT_MASTER_METRICS}:9324 command: "master -ip=master -ip.bind=0.0.0.0 -metricsPort=9324" - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} @@ -37,9 +34,6 @@ services: - ${PANEL_APP_PORT_VOLUME_API}:18080 - ${PANEL_APP_PORT_VOLUME_METRICS}:9325 command: 'volume -mserver="seaweedfs-master:9333" -ip.bind=0.0.0.0 -port=8080 -metricsPort=9325' - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} @@ -62,9 +56,6 @@ services: command: 'filer -master="seaweedfs-master:9333" -ip.bind=0.0.0.0 -metricsPort=9326' tty: true stdin_open: true - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} @@ -87,9 +78,6 @@ services: - ${PANEL_APP_PORT_HTTP}:8333 - ${PANEL_APP_PORT_S3_METRICS}:9327 command: 's3 -filer="seaweedfs-filer:8888" -ip.bind=0.0.0.0 -metricsPort=9327' - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} @@ -109,9 +97,6 @@ services: ports: - ${PANEL_APP_PORT_WEBDAV}:7333 command: 'webdav -filer="seaweedfs-filer:8888"' - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} @@ -129,9 +114,6 @@ services: ports: - ${PANEL_APP_PORT_METRICS}:9090 command: --web.enable-lifecycle --config.file=/etc/prometheus/prometheus.yml - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SEAWEEDFS_ROOT_PATH}/prometheus:/etc/prometheus environment: diff --git a/apps/seaweedfs/3.96/envs/default.env b/apps/seaweedfs/3.96/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/seaweedfs/3.96/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/seaweedfs/3.96/envs/global.env b/apps/seaweedfs/3.96/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/seaweedfs/3.96/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/seaweedfs/3.96/scripts/init.sh b/apps/seaweedfs/3.96/scripts/init.sh index e6604710b..73d594fd3 100644 --- a/apps/seaweedfs/3.96/scripts/init.sh +++ b/apps/seaweedfs/3.96/scripts/init.sh @@ -3,13 +3,6 @@ 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 - if [ ! -d $SEAWEEDFS_ROOT_PATH/prometheus ]; then mkdir -p $SEAWEEDFS_ROOT_PATH/prometheus fi diff --git a/apps/seaweedfs/3.96/scripts/uninstall.sh b/apps/seaweedfs/3.96/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/seaweedfs/3.96/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/seaweedfs/3.96/scripts/upgrade.sh b/apps/seaweedfs/3.96/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/seaweedfs/3.96/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/sentinel/1.8.8/data.yml b/apps/sentinel/1.8.8/data.yml index 4580418a5..1c023bfab 100644 --- a/apps/sentinel/1.8.8/data.yml +++ b/apps/sentinel/1.8.8/data.yml @@ -30,22 +30,6 @@ additionalProperties: labelZh: 控制台 密码 required: true type: text - - default: "host" - 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: "false" edit: true envKey: SENTINEL_DASHBOARD_FEIGN_ENABLED diff --git a/apps/sentinel/1.8.8/docker-compose.yml b/apps/sentinel/1.8.8/docker-compose.yml index 3b56c4d36..5b178a2c1 100644 --- a/apps/sentinel/1.8.8/docker-compose.yml +++ b/apps/sentinel/1.8.8/docker-compose.yml @@ -9,7 +9,8 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8858 - ${COMMUNICATION_PORT}:8719 diff --git a/apps/sentinel/1.8.8/envs/default.env b/apps/sentinel/1.8.8/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/sentinel/1.8.8/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/sentinel/1.8.8/envs/global.env b/apps/sentinel/1.8.8/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/sentinel/1.8.8/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/sentinel/1.8.8/scripts/init.sh b/apps/sentinel/1.8.8/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/sentinel/1.8.8/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/sentinel/1.8.8/scripts/uninstall.sh b/apps/sentinel/1.8.8/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/sentinel/1.8.8/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/sentinel/1.8.8/scripts/upgrade.sh b/apps/sentinel/1.8.8/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/sentinel/1.8.8/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/shiori/1.7.4/data.yml b/apps/shiori/1.7.4/data.yml index 0de408e80..4db19931a 100644 --- a/apps/shiori/1.7.4/data.yml +++ b/apps/shiori/1.7.4/data.yml @@ -20,7 +20,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/shiori" + - default: "./data" edit: true envKey: SHIORI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/shiori/1.7.4/docker-compose.yml b/apps/shiori/1.7.4/docker-compose.yml index 88a567cfa..419cade5c 100644 --- a/apps/shiori/1.7.4/docker-compose.yml +++ b/apps/shiori/1.7.4/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:8080 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SHIORI_ROOT_PATH}/dev-data:/srv/shiori - ${SHIORI_ROOT_PATH}/data:/src/shiori diff --git a/apps/shiori/1.7.4/envs/default.env b/apps/shiori/1.7.4/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/shiori/1.7.4/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/shiori/1.7.4/envs/global.env b/apps/shiori/1.7.4/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/shiori/1.7.4/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/shiori/1.7.4/scripts/init.sh b/apps/shiori/1.7.4/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/shiori/1.7.4/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/shiori/1.7.4/scripts/uninstall.sh b/apps/shiori/1.7.4/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/shiori/1.7.4/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/shiori/1.7.4/scripts/upgrade.sh b/apps/shiori/1.7.4/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/shiori/1.7.4/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/shopware-dockware/6.7.1.2/docker-compose.yml b/apps/shopware-dockware/6.7.1.2/docker-compose.yml index b7c568f93..4a21ae192 100644 --- a/apps/shopware-dockware/6.7.1.2/docker-compose.yml +++ b/apps/shopware-dockware/6.7.1.2/docker-compose.yml @@ -20,9 +20,6 @@ services: - 8888 - 22 - 443 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai - XDEBUG_ENABLED=0 diff --git a/apps/shopware-dockware/6.7.1.2/envs/default.env b/apps/shopware-dockware/6.7.1.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/shopware-dockware/6.7.1.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/shopware-dockware/6.7.1.2/envs/global.env b/apps/shopware-dockware/6.7.1.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/shopware-dockware/6.7.1.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/shopware-dockware/6.7.1.2/scripts/init.sh b/apps/shopware-dockware/6.7.1.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/shopware-dockware/6.7.1.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/shopware-dockware/6.7.1.2/scripts/uninstall.sh b/apps/shopware-dockware/6.7.1.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/shopware-dockware/6.7.1.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/shopware-dockware/6.7.1.2/scripts/upgrade.sh b/apps/shopware-dockware/6.7.1.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/shopware-dockware/6.7.1.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/siyuan/3.3.0/envs/default.env b/apps/siyuan/3.3.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/siyuan/3.3.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/siyuan/3.3.0/envs/global.env b/apps/siyuan/3.3.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/siyuan/3.3.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/siyuan/3.3.0/scripts/init.sh b/apps/siyuan/3.3.0/scripts/init.sh deleted file mode 100644 index 801a74894..000000000 --- a/apps/siyuan/3.3.0/scripts/init.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - if [ ! -d $SIYUAN_ROOT_PATH ]; then - mkdir -p $SIYUAN_ROOT_PATH - fi - - if [ ! -d $SIYUAN_ROOT_PATH/workspace ]; then - mkdir -p $SIYUAN_ROOT_PATH/workspace - fi - - chown -R 1000:1000 $SIYUAN_ROOT_PATH - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/siyuan/3.3.0/scripts/uninstall.sh b/apps/siyuan/3.3.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/siyuan/3.3.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/siyuan/3.3.0/scripts/upgrade.sh b/apps/siyuan/3.3.0/scripts/upgrade.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/siyuan/3.3.0/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/slink/1.6.4/envs/default.env b/apps/slink/1.6.4/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/slink/1.6.4/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/slink/1.6.4/envs/global.env b/apps/slink/1.6.4/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/slink/1.6.4/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/slink/1.6.4/scripts/init.sh b/apps/slink/1.6.4/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/slink/1.6.4/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/slink/1.6.4/scripts/uninstall.sh b/apps/slink/1.6.4/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/slink/1.6.4/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/slink/1.6.4/scripts/upgrade.sh b/apps/slink/1.6.4/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/slink/1.6.4/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/smanga/4.1.1/data.yml b/apps/smanga/4.1.1/data.yml index 1dee5500d..6fbdad484 100644 --- a/apps/smanga/4.1.1/data.yml +++ b/apps/smanga/4.1.1/data.yml @@ -1,12 +1,19 @@ additionalProperties: formFields: - - default: "/home/smanga" + - default: "./data" edit: true envKey: SMANGA_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text + - default: "./compressed" + edit: true + envKey: SMANGA_COMPRESS_PATH + labelZh: 压缩包解压目录，请挂在到对容量有信心的硬盘上 + labelEn: Compressed package decompression path + required: true + type: text - default: 9797 edit: true envKey: PANEL_APP_PORT_HTTP @@ -22,24 +29,3 @@ additionalProperties: labelEn: HTTP(s) Proxy required: false type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/smanga/4.1.1/docker-compose.yml b/apps/smanga/4.1.1/docker-compose.yml index 416584e25..4564a8ea1 100644 --- a/apps/smanga/4.1.1/docker-compose.yml +++ b/apps/smanga/4.1.1/docker-compose.yml @@ -13,14 +13,11 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:9797 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SMANGA_ROOT_PATH}/data:/data - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${SMANGA_COMPRESS_PATH}:/compress + - ${SMANGA_ROOT_PATH}/config:/config + - ${SMANGA_ROOT_PATH}/mysql:/var/lib/mysql environment: - TZ=Asia/Shanghai - HTTPS_PROXY=${HTTP_PROXY:-} diff --git a/apps/smanga/4.1.1/envs/default.env b/apps/smanga/4.1.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/smanga/4.1.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/smanga/4.1.1/envs/global.env b/apps/smanga/4.1.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/smanga/4.1.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/smanga/4.1.1/scripts/init.sh b/apps/smanga/4.1.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/smanga/4.1.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/smanga/4.1.1/scripts/uninstall.sh b/apps/smanga/4.1.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/smanga/4.1.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/smanga/4.1.1/scripts/upgrade.sh b/apps/smanga/4.1.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/smanga/4.1.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/smtp-proxy-server/1.0.4/docker-compose.yml b/apps/smtp-proxy-server/1.0.4/docker-compose.yml index a8cd6d9bc..8b44278c0 100644 --- a/apps/smtp-proxy-server/1.0.4/docker-compose.yml +++ b/apps/smtp-proxy-server/1.0.4/docker-compose.yml @@ -14,9 +14,6 @@ services: ports: - ${PANEL_APP_PORT_SMTP}:${PANEL_APP_PORT_SMTP} - ${PANEL_APP_PORT_IMAP}:${PANEL_APP_PORT_IMAP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai - proxy_url=${PROXY_URL} diff --git a/apps/smtp-proxy-server/1.0.4/envs/default.env b/apps/smtp-proxy-server/1.0.4/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/smtp-proxy-server/1.0.4/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/smtp-proxy-server/1.0.4/envs/global.env b/apps/smtp-proxy-server/1.0.4/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/smtp-proxy-server/1.0.4/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/smtp-proxy-server/1.0.4/scripts/init.sh b/apps/smtp-proxy-server/1.0.4/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/smtp-proxy-server/1.0.4/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/smtp-proxy-server/1.0.4/scripts/uninstall.sh b/apps/smtp-proxy-server/1.0.4/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/smtp-proxy-server/1.0.4/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/smtp-proxy-server/1.0.4/scripts/upgrade.sh b/apps/smtp-proxy-server/1.0.4/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/smtp-proxy-server/1.0.4/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/smtp-proxy-server/data.yml b/apps/smtp-proxy-server/data.yml index 367e76d4a..baf24d036 100644 --- a/apps/smtp-proxy-server/data.yml +++ b/apps/smtp-proxy-server/data.yml @@ -9,6 +9,6 @@ additionalProperties: type: website crossVersionUpdate: true limit: 0 - website: https://temp-mail-docs.awsl.uk/ + website: https://mail.awsl.uk/ github: https://github.com/dreamhunter2333/cloudflare_temp_email/ document: https://temp-mail-docs.awsl.uk/ diff --git a/apps/sonarr/4.0.15/envs/default.env b/apps/sonarr/4.0.15/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/sonarr/4.0.15/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/sonarr/4.0.15/envs/global.env b/apps/sonarr/4.0.15/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/sonarr/4.0.15/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/sonarr/4.0.15/scripts/init.sh b/apps/sonarr/4.0.15/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/sonarr/4.0.15/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/sonarr/4.0.15/scripts/uninstall.sh b/apps/sonarr/4.0.15/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/sonarr/4.0.15/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/sonarr/4.0.15/scripts/upgrade.sh b/apps/sonarr/4.0.15/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/sonarr/4.0.15/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/speedtest-tracker-sqlite/1.6.6/data.yml b/apps/speedtest-tracker-sqlite/1.6.6/data.yml index 7670657e5..115d0acee 100644 --- a/apps/speedtest-tracker-sqlite/1.6.6/data.yml +++ b/apps/speedtest-tracker-sqlite/1.6.6/data.yml @@ -1,28 +1,12 @@ additionalProperties: formFields: - - default: "/home/speedtest-tracker" + - default: "./data" edit: true envKey: SPEEDTEST_TRACKER_ROOT_PATH labelEn: Data persistence root path labelZh: 数据持久化 根路径 required: true type: text - - default: "host" - 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: 8080 edit: true envKey: PANEL_APP_PORT_HTTP @@ -31,11 +15,11 @@ additionalProperties: required: true rule: paramPort type: number - - default: "base64:f0Ivk1nHd3QwXtR55WKC4fcc7QjrxxTnkiB02ipdl60=" + - default: "" edit: true envKey: APP_KEY - labelZh: 应用密钥 (官网获取) - labelEn: App key (Get from official website) + labelZh: 应用密钥 + labelEn: App key required: true type: text - default: "SpeedTest Tracker" diff --git a/apps/speedtest-tracker-sqlite/1.6.6/docker-compose.yml b/apps/speedtest-tracker-sqlite/1.6.6/docker-compose.yml index 41ea496dc..a6a4c95ca 100644 --- a/apps/speedtest-tracker-sqlite/1.6.6/docker-compose.yml +++ b/apps/speedtest-tracker-sqlite/1.6.6/docker-compose.yml @@ -9,18 +9,17 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + network_mode: + - 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: - ${SPEEDTEST_TRACKER_ROOT_PATH}/config:/config environment: - PUID=1000 - PGID=1000 - TZ=Asia/Shanghai + - APP_KEY=${APP_KEY} - DISPLAY_TIMEZONE=Asia/Shanghai - DB_CONNECTION=sqlite - MAIL_MAILER=sqlite diff --git a/apps/speedtest-tracker-sqlite/1.6.6/envs/default.env b/apps/speedtest-tracker-sqlite/1.6.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/speedtest-tracker-sqlite/1.6.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/speedtest-tracker-sqlite/1.6.6/envs/global.env b/apps/speedtest-tracker-sqlite/1.6.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/speedtest-tracker-sqlite/1.6.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/speedtest-tracker-sqlite/1.6.6/scripts/init.sh b/apps/speedtest-tracker-sqlite/1.6.6/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/speedtest-tracker-sqlite/1.6.6/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/speedtest-tracker-sqlite/1.6.6/scripts/uninstall.sh b/apps/speedtest-tracker-sqlite/1.6.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/speedtest-tracker-sqlite/1.6.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/speedtest-tracker-sqlite/1.6.6/scripts/upgrade.sh b/apps/speedtest-tracker-sqlite/1.6.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/speedtest-tracker-sqlite/1.6.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/speedtest-tracker-sqlite/README.md b/apps/speedtest-tracker-sqlite/README.md index 81d5712d7..9f5c0108c 100644 --- a/apps/speedtest-tracker-sqlite/README.md +++ b/apps/speedtest-tracker-sqlite/README.md @@ -16,6 +16,13 @@ Speedtest Tracker 是一个自托管的互联网性能跟踪应用程序，可 ## 安装说明 +#### 生成应用密钥 + +需要安装 openssl ，运行以下命令以生成密钥，密钥用于加密。复制包括前缀在内的此密钥，并将其粘贴为您的值。 +```bash +echo -n 'base64:'; openssl rand -base64 32; +``` + > admin@example.com > > password diff --git a/apps/speedtest-tracker/1.6.6/data.yml b/apps/speedtest-tracker/1.6.6/data.yml index d2a06f24d..5a98bada9 100644 --- a/apps/speedtest-tracker/1.6.6/data.yml +++ b/apps/speedtest-tracker/1.6.6/data.yml @@ -21,29 +21,13 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/speedtest-tracker" + - default: "./data" edit: true envKey: SPEEDTEST_TRACKER_ROOT_PATH labelEn: Data persistence root path labelZh: 数据持久化 根路径 required: true type: text - - default: "host" - 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: 8080 edit: true envKey: PANEL_APP_PORT_HTTP @@ -52,11 +36,11 @@ additionalProperties: required: true rule: paramPort type: number - - default: "base64:f0Ivk1nHd3QwXtR55WKC4fcc7QjrxxTnkiB02ipdl60=" + - default: "" edit: true envKey: APP_KEY - labelZh: 应用密钥 (官网获取) - labelEn: App key (Get from official website) + labelZh: 应用密钥 + labelEn: App key required: true type: text - default: "SpeedTest Tracker" diff --git a/apps/speedtest-tracker/1.6.6/docker-compose.yml b/apps/speedtest-tracker/1.6.6/docker-compose.yml index c0a1afa26..afa1bb3a3 100644 --- a/apps/speedtest-tracker/1.6.6/docker-compose.yml +++ b/apps/speedtest-tracker/1.6.6/docker-compose.yml @@ -9,16 +9,17 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + network_mode: + - 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: - ${SPEEDTEST_TRACKER_ROOT_PATH}/config:/config environment: - PUID=1000 - PGID=1000 - TZ=Asia/Shanghai + - APP_KEY=${APP_KEY} - DISPLAY_TIMEZONE=Asia/Shanghai + - DB_CONNECTION=${DB_CONNECTION} + - MAIL_MAILER=${MAIL_MAILER} diff --git a/apps/speedtest-tracker/1.6.6/envs/default.env b/apps/speedtest-tracker/1.6.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/speedtest-tracker/1.6.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/speedtest-tracker/1.6.6/envs/global.env b/apps/speedtest-tracker/1.6.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/speedtest-tracker/1.6.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/speedtest-tracker/1.6.6/scripts/init.sh b/apps/speedtest-tracker/1.6.6/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/speedtest-tracker/1.6.6/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/speedtest-tracker/1.6.6/scripts/uninstall.sh b/apps/speedtest-tracker/1.6.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/speedtest-tracker/1.6.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/speedtest-tracker/1.6.6/scripts/upgrade.sh b/apps/speedtest-tracker/1.6.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/speedtest-tracker/1.6.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/speedtest-tracker/README.md b/apps/speedtest-tracker/README.md index c41c5250c..5eb60f737 100644 --- a/apps/speedtest-tracker/README.md +++ b/apps/speedtest-tracker/README.md @@ -16,6 +16,13 @@ Speedtest Tracker 是一个自托管的互联网性能跟踪应用程序，可 ## 安装说明 +#### 生成应用密钥 + +需要安装 openssl ，运行以下命令以生成密钥，密钥用于加密。复制包括前缀在内的此密钥，并将其粘贴为您的值。 +```bash +echo -n 'base64:'; openssl rand -base64 32; +``` + > admin@example.com > > password diff --git a/apps/speedtest/5.4.1/data.yml b/apps/speedtest/5.4.1/data.yml index 666fc3672..e48226476 100644 --- a/apps/speedtest/5.4.1/data.yml +++ b/apps/speedtest/5.4.1/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/speedtest" + - default: "./data" edit: true envKey: SPEED_TEST_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/speedtest/5.4.1/docker-compose.yml b/apps/speedtest/5.4.1/docker-compose.yml index 6dbf5762f..cda0f47c2 100644 --- a/apps/speedtest/5.4.1/docker-compose.yml +++ b/apps/speedtest/5.4.1/docker-compose.yml @@ -13,9 +13,6 @@ 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: - ${SPEED_TEST_ROOT_PATH}/database:/database environment: diff --git a/apps/speedtest/5.4.1/envs/default.env b/apps/speedtest/5.4.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/speedtest/5.4.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/speedtest/5.4.1/envs/global.env b/apps/speedtest/5.4.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/speedtest/5.4.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/speedtest/5.4.1/scripts/init.sh b/apps/speedtest/5.4.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/speedtest/5.4.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/speedtest/5.4.1/scripts/uninstall.sh b/apps/speedtest/5.4.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/speedtest/5.4.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/speedtest/5.4.1/scripts/upgrade.sh b/apps/speedtest/5.4.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/speedtest/5.4.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stash-box/development/data.yml b/apps/stash-box/development/data.yml index 1628c4473..74b128ad5 100644 --- a/apps/stash-box/development/data.yml +++ b/apps/stash-box/development/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stash-box" + - default: "./data" edit: true envKey: STASH_BOX_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stash-box/development/docker-compose.yml b/apps/stash-box/development/docker-compose.yml index 9cc4affc3..911a911f1 100644 --- a/apps/stash-box/development/docker-compose.yml +++ b/apps/stash-box/development/docker-compose.yml @@ -17,9 +17,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} logging: driver: "json-file" options: diff --git a/apps/stash-box/development/envs/default.env b/apps/stash-box/development/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stash-box/development/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stash-box/development/envs/global.env b/apps/stash-box/development/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stash-box/development/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stash-box/development/scripts/init.sh b/apps/stash-box/development/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stash-box/development/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stash-box/development/scripts/uninstall.sh b/apps/stash-box/development/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stash-box/development/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stash-box/development/scripts/upgrade.sh b/apps/stash-box/development/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stash-box/development/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stash/0.28.1/envs/default.env b/apps/stash/0.28.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stash/0.28.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stash/0.28.1/envs/global.env b/apps/stash/0.28.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stash/0.28.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stash/0.28.1/scripts/init.sh b/apps/stash/0.28.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stash/0.28.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stash/0.28.1/scripts/uninstall.sh b/apps/stash/0.28.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stash/0.28.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stash/0.28.1/scripts/upgrade.sh b/apps/stash/0.28.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stash/0.28.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-backend/0.7.2/data.yml b/apps/stream-rec-backend/0.7.2/data.yml index 08ef890a1..1679ee54d 100644 --- a/apps/stream-rec-backend/0.7.2/data.yml +++ b/apps/stream-rec-backend/0.7.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec-backend/0.7.2/docker-compose.yml b/apps/stream-rec-backend/0.7.2/docker-compose.yml index 71e52df91..111befede 100644 --- a/apps/stream-rec-backend/0.7.2/docker-compose.yml +++ b/apps/stream-rec-backend/0.7.2/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:12555 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records - ${STREAM_REC_ROOT_PATH}/download:/download diff --git a/apps/stream-rec-backend/0.7.2/envs/default.env b/apps/stream-rec-backend/0.7.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec-backend/0.7.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec-backend/0.7.2/envs/global.env b/apps/stream-rec-backend/0.7.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec-backend/0.7.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec-backend/0.7.2/scripts/init.sh b/apps/stream-rec-backend/0.7.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-backend/0.7.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-backend/0.7.2/scripts/uninstall.sh b/apps/stream-rec-backend/0.7.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec-backend/0.7.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh b/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-backend/main/data.yml b/apps/stream-rec-backend/main/data.yml index 08ef890a1..1679ee54d 100644 --- a/apps/stream-rec-backend/main/data.yml +++ b/apps/stream-rec-backend/main/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec-backend/main/docker-compose.yml b/apps/stream-rec-backend/main/docker-compose.yml index 5c7b74273..dfc9071f1 100644 --- a/apps/stream-rec-backend/main/docker-compose.yml +++ b/apps/stream-rec-backend/main/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:12555 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records - ${STREAM_REC_ROOT_PATH}/download:/download diff --git a/apps/stream-rec-backend/main/envs/default.env b/apps/stream-rec-backend/main/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec-backend/main/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec-backend/main/envs/global.env b/apps/stream-rec-backend/main/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec-backend/main/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec-backend/main/scripts/init.sh b/apps/stream-rec-backend/main/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-backend/main/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-backend/main/scripts/uninstall.sh b/apps/stream-rec-backend/main/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec-backend/main/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec-backend/main/scripts/upgrade.sh b/apps/stream-rec-backend/main/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-backend/main/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-frontend/0.7.2/data.yml b/apps/stream-rec-frontend/0.7.2/data.yml index c90bf4283..482e68a26 100644 --- a/apps/stream-rec-frontend/0.7.2/data.yml +++ b/apps/stream-rec-frontend/0.7.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec-frontend/0.7.2/docker-compose.yml b/apps/stream-rec-frontend/0.7.2/docker-compose.yml index 1d695a01a..41612a66f 100644 --- a/apps/stream-rec-frontend/0.7.2/docker-compose.yml +++ b/apps/stream-rec-frontend/0.7.2/docker-compose.yml @@ -13,6 +13,3 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:15275 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/apps/stream-rec-frontend/0.7.2/envs/default.env b/apps/stream-rec-frontend/0.7.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec-frontend/0.7.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec-frontend/0.7.2/envs/global.env b/apps/stream-rec-frontend/0.7.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec-frontend/0.7.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec-frontend/0.7.2/scripts/init.sh b/apps/stream-rec-frontend/0.7.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-frontend/0.7.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-frontend/0.7.2/scripts/uninstall.sh b/apps/stream-rec-frontend/0.7.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec-frontend/0.7.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh b/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-frontend/main/data.yml b/apps/stream-rec-frontend/main/data.yml index c90bf4283..482e68a26 100644 --- a/apps/stream-rec-frontend/main/data.yml +++ b/apps/stream-rec-frontend/main/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec-frontend/main/docker-compose.yml b/apps/stream-rec-frontend/main/docker-compose.yml index b34145e7d..62a522b1d 100644 --- a/apps/stream-rec-frontend/main/docker-compose.yml +++ b/apps/stream-rec-frontend/main/docker-compose.yml @@ -13,6 +13,3 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:15275 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/apps/stream-rec-frontend/main/envs/default.env b/apps/stream-rec-frontend/main/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec-frontend/main/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec-frontend/main/envs/global.env b/apps/stream-rec-frontend/main/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec-frontend/main/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec-frontend/main/scripts/init.sh b/apps/stream-rec-frontend/main/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-frontend/main/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec-frontend/main/scripts/uninstall.sh b/apps/stream-rec-frontend/main/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec-frontend/main/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec-frontend/main/scripts/upgrade.sh b/apps/stream-rec-frontend/main/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec-frontend/main/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/0.7.2/data.yml b/apps/stream-rec/0.7.2/data.yml index 44a51650b..2ec6a4294 100644 --- a/apps/stream-rec/0.7.2/data.yml +++ b/apps/stream-rec/0.7.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec/0.7.2/docker-compose.yml b/apps/stream-rec/0.7.2/docker-compose.yml index 3224e992f..b6de23efc 100644 --- a/apps/stream-rec/0.7.2/docker-compose.yml +++ b/apps/stream-rec/0.7.2/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_API}:12555 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records - ${STREAM_REC_ROOT_PATH}/rclone:/root/.config/rclone @@ -41,9 +38,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:15275 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api diff --git a/apps/stream-rec/0.7.2/envs/default.env b/apps/stream-rec/0.7.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec/0.7.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec/0.7.2/envs/global.env b/apps/stream-rec/0.7.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec/0.7.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec/0.7.2/scripts/init.sh b/apps/stream-rec/0.7.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/0.7.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/0.7.2/scripts/uninstall.sh b/apps/stream-rec/0.7.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec/0.7.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec/0.7.2/scripts/upgrade.sh b/apps/stream-rec/0.7.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/0.7.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/dev/data.yml b/apps/stream-rec/dev/data.yml index 44a51650b..2ec6a4294 100644 --- a/apps/stream-rec/dev/data.yml +++ b/apps/stream-rec/dev/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec/dev/docker-compose.yml b/apps/stream-rec/dev/docker-compose.yml index 0fd254119..62e8a64cc 100644 --- a/apps/stream-rec/dev/docker-compose.yml +++ b/apps/stream-rec/dev/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_API}:12555 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records - ${STREAM_REC_ROOT_PATH}/rclone:/root/.config/rclone @@ -41,9 +38,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:15275 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api diff --git a/apps/stream-rec/dev/envs/default.env b/apps/stream-rec/dev/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec/dev/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec/dev/envs/global.env b/apps/stream-rec/dev/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec/dev/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec/dev/scripts/init.sh b/apps/stream-rec/dev/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/dev/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/dev/scripts/uninstall.sh b/apps/stream-rec/dev/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec/dev/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec/dev/scripts/upgrade.sh b/apps/stream-rec/dev/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/dev/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/latest/data.yml b/apps/stream-rec/latest/data.yml index 44a51650b..2ec6a4294 100644 --- a/apps/stream-rec/latest/data.yml +++ b/apps/stream-rec/latest/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec/latest/docker-compose.yml b/apps/stream-rec/latest/docker-compose.yml index b351db533..48e2d933f 100644 --- a/apps/stream-rec/latest/docker-compose.yml +++ b/apps/stream-rec/latest/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_API}:12555 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records - ${STREAM_REC_ROOT_PATH}/rclone:/root/.config/rclone @@ -41,9 +38,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:15275 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api diff --git a/apps/stream-rec/latest/envs/default.env b/apps/stream-rec/latest/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec/latest/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec/latest/envs/global.env b/apps/stream-rec/latest/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec/latest/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec/latest/scripts/init.sh b/apps/stream-rec/latest/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/latest/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/latest/scripts/uninstall.sh b/apps/stream-rec/latest/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec/latest/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec/latest/scripts/upgrade.sh b/apps/stream-rec/latest/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/latest/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/main/data.yml b/apps/stream-rec/main/data.yml index 44a51650b..2ec6a4294 100644 --- a/apps/stream-rec/main/data.yml +++ b/apps/stream-rec/main/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/stream-rec" + - default: "./data" edit: true envKey: STREAM_REC_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/stream-rec/main/docker-compose.yml b/apps/stream-rec/main/docker-compose.yml index ae5f0dfbc..24ff5332d 100644 --- a/apps/stream-rec/main/docker-compose.yml +++ b/apps/stream-rec/main/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_API}:12555 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records - ${STREAM_REC_ROOT_PATH}/rclone:/root/.config/rclone @@ -41,9 +38,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:15275 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api diff --git a/apps/stream-rec/main/envs/default.env b/apps/stream-rec/main/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/stream-rec/main/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/stream-rec/main/envs/global.env b/apps/stream-rec/main/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/stream-rec/main/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/stream-rec/main/scripts/init.sh b/apps/stream-rec/main/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/main/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/stream-rec/main/scripts/uninstall.sh b/apps/stream-rec/main/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/stream-rec/main/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/stream-rec/main/scripts/upgrade.sh b/apps/stream-rec/main/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/stream-rec/main/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/sun-panel/1.7.0/envs/default.env b/apps/sun-panel/1.7.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/sun-panel/1.7.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/sun-panel/1.7.0/envs/global.env b/apps/sun-panel/1.7.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/sun-panel/1.7.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/sun-panel/1.7.0/scripts/init.sh b/apps/sun-panel/1.7.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/sun-panel/1.7.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/sun-panel/1.7.0/scripts/uninstall.sh b/apps/sun-panel/1.7.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/sun-panel/1.7.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/sun-panel/1.7.0/scripts/upgrade.sh b/apps/sun-panel/1.7.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/sun-panel/1.7.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/super-productivity/14.4.0/data.yml b/apps/super-productivity/14.4.0/data.yml index f40ef60a9..796980e5e 100644 --- a/apps/super-productivity/14.4.0/data.yml +++ b/apps/super-productivity/14.4.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/super-productivity" + - default: "./data" edit: true envKey: SUPER_PRODUCTIVITY_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/super-productivity/14.4.0/docker-compose.yml b/apps/super-productivity/14.4.0/docker-compose.yml index f8da24e83..6254636cc 100644 --- a/apps/super-productivity/14.4.0/docker-compose.yml +++ b/apps/super-productivity/14.4.0/docker-compose.yml @@ -13,20 +13,14 @@ 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} environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav sp-webdav: - image: hacdias/webdav:latest + image: hacdias/webdav:v5.8 restart: always networks: - 1panel-network - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SUPER_PRODUCTIVITY_ROOT_PATH}/config/webdav.yaml:/config.yml - ${SUPER_PRODUCTIVITY_ROOT_PATH}/data:/data diff --git a/apps/super-productivity/14.4.0/envs/default.env b/apps/super-productivity/14.4.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/super-productivity/14.4.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/super-productivity/14.4.0/envs/global.env b/apps/super-productivity/14.4.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/super-productivity/14.4.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/super-productivity/14.4.0/scripts/init.sh b/apps/super-productivity/14.4.0/scripts/init.sh index 16af78ff6..93c509567 100644 --- a/apps/super-productivity/14.4.0/scripts/init.sh +++ b/apps/super-productivity/14.4.0/scripts/init.sh @@ -3,13 +3,6 @@ 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 - mkdir -p "$SUPER_PRODUCTIVITY_ROOT_PATH" mkdir -p "$SUPER_PRODUCTIVITY_ROOT_PATH/data" mkdir -p "$SUPER_PRODUCTIVITY_ROOT_PATH/config" diff --git a/apps/super-productivity/14.4.0/scripts/uninstall.sh b/apps/super-productivity/14.4.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/super-productivity/14.4.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/super-productivity/14.4.0/scripts/upgrade.sh b/apps/super-productivity/14.4.0/scripts/upgrade.sh index c49abea9e..bdaa9d558 100644 --- a/apps/super-productivity/14.4.0/scripts/upgrade.sh +++ b/apps/super-productivity/14.4.0/scripts/upgrade.sh @@ -3,13 +3,6 @@ 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 - mkdir -p "$SUPER_PRODUCTIVITY_ROOT_PATH" mkdir -p "$SUPER_PRODUCTIVITY_ROOT_PATH/data" mkdir -p "$SUPER_PRODUCTIVITY_ROOT_PATH/config" diff --git a/apps/surveyking-h2/1.9.0/data.yml b/apps/surveyking-h2/1.9.0/data.yml index 773317bcd..775b15a3e 100644 --- a/apps/surveyking-h2/1.9.0/data.yml +++ b/apps/surveyking-h2/1.9.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/surveyking" + - default: "./data" edit: true envKey: SURVEYKING_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/surveyking-h2/1.9.0/docker-compose.yml b/apps/surveyking-h2/1.9.0/docker-compose.yml index 406715327..878050c87 100644 --- a/apps/surveyking-h2/1.9.0/docker-compose.yml +++ b/apps/surveyking-h2/1.9.0/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:1991 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SURVEYKING_ROOT_PATH}/db:/app/db - ${SURVEYKING_ROOT_PATH}/files:/app/files diff --git a/apps/surveyking-h2/1.9.0/envs/default.env b/apps/surveyking-h2/1.9.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/surveyking-h2/1.9.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/surveyking-h2/1.9.0/envs/global.env b/apps/surveyking-h2/1.9.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/surveyking-h2/1.9.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/surveyking-h2/1.9.0/scripts/init.sh b/apps/surveyking-h2/1.9.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/surveyking-h2/1.9.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/surveyking-h2/1.9.0/scripts/uninstall.sh b/apps/surveyking-h2/1.9.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/surveyking-h2/1.9.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/surveyking-h2/1.9.0/scripts/upgrade.sh b/apps/surveyking-h2/1.9.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/surveyking-h2/1.9.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/surveyking/1.9.0/.env.sample b/apps/surveyking/1.9.0/.env.sample new file mode 100644 index 000000000..3f45477a9 --- /dev/null +++ b/apps/surveyking/1.9.0/.env.sample @@ -0,0 +1,3 @@ +CONTAINER_NAME="surveyking" +PANEL_APP_PORT_HTTP="40103" +DATA_PATH="./data" diff --git a/apps/surveyking/1.9.0/data.yml b/apps/surveyking/1.9.0/data.yml index aac002a9e..72ef714b2 100644 --- a/apps/surveyking/1.9.0/data.yml +++ b/apps/surveyking/1.9.0/data.yml @@ -1,75 +1,17 @@ additionalProperties: formFields: - - child: - default: "" - envKey: PANEL_DB_HOST - required: true - type: service - default: mysql - edit: true - envKey: PANEL_DB_TYPE - labelZh: MySQL 服务 (前置检查) - labelEn: Database Service (Pre-check) - required: true - type: apps - values: - - label: MariaDB - value: mariadb - - label: MySQL - value: mysql - - label: Percona - value: percona - - default: "/home/surveyking" - edit: true - envKey: SURVEYKING_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 1991 + - default: 40103 edit: true envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port + labelEn: Port + labelZh: 端口 required: true rule: paramPort type: number - - default: "127.0.0.1" + - default: ./data edit: true - envKey: DB_HOSTNAME - labelZh: 数据库 主机地址 - labelEn: Database Host + envKey: DATA_PATH + labelEn: Data folder path + labelZh: 数据文件夹路径 required: true type: text - - default: 5432 - edit: true - envKey: DB_PORT - labelZh: 数据库 端口 - labelEn: Database Port - required: true - rule: paramPort - type: number - - default: "surveyking" - edit: true - envKey: DB_NAME - labelZh: 数据库 名称 - labelEn: Database Name - required: true - rule: paramCommon - type: text - - default: "surveyking" - edit: true - envKey: MYSQL_USER - labelZh: 数据库 用户名 - labelEn: Database Username - required: true - type: text - - default: "" - edit: true - envKey: MYSQL_PASS - labelZh: 数据库 密码 - labelEn: Database Password - random: true - required: true - rule: paramComplexity - type: password diff --git a/apps/surveyking/1.9.0/docker-compose.yml b/apps/surveyking/1.9.0/docker-compose.yml index 2e9e31a97..bac10e7f9 100644 --- a/apps/surveyking/1.9.0/docker-compose.yml +++ b/apps/surveyking/1.9.0/docker-compose.yml @@ -1,24 +1,18 @@ -networks: - 1panel-network: - external: true - services: surveyking: - image: surveyking/surveyking:v1.9.0 container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" restart: always networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:1991 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - "${PANEL_APP_PORT_HTTP}:1991" volumes: - - ${SURVEYKING_ROOT_PATH}/files:/app/files - - ${SURVEYKING_ROOT_PATH}/logs:/app/logs - environment: - - PROFILE=mysql - - DB_URL=jdbc:mysql://${DB_HOSTNAME}:${DB_PORT}/${DB_NAME} + - "${DATA_PATH}/files:/surveyking/files" + - "${DATA_PATH}/logs:/surveyking/logs" + image: surveyking/surveyking:v1.9.0 + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/surveyking/1.9.0/envs/default.env b/apps/surveyking/1.9.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/surveyking/1.9.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/surveyking/1.9.0/envs/global.env b/apps/surveyking/1.9.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/surveyking/1.9.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/surveyking/1.9.0/scripts/init.sh b/apps/surveyking/1.9.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/surveyking/1.9.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/surveyking/1.9.0/scripts/uninstall.sh b/apps/surveyking/1.9.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/surveyking/1.9.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/surveyking/1.9.0/scripts/upgrade.sh b/apps/surveyking/1.9.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/surveyking/1.9.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/synapse-admin/0.11.1/envs/default.env b/apps/synapse-admin/0.11.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/synapse-admin/0.11.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/synapse-admin/0.11.1/envs/global.env b/apps/synapse-admin/0.11.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/synapse-admin/0.11.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/synapse-admin/0.11.1/scripts/init.sh b/apps/synapse-admin/0.11.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/synapse-admin/0.11.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/synapse-admin/0.11.1/scripts/uninstall.sh b/apps/synapse-admin/0.11.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/synapse-admin/0.11.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/synapse-admin/0.11.1/scripts/upgrade.sh b/apps/synapse-admin/0.11.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/synapse-admin/0.11.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/synapse/1.137.0/envs/default.env b/apps/synapse/1.137.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/synapse/1.137.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/synapse/1.137.0/envs/global.env b/apps/synapse/1.137.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/synapse/1.137.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/synapse/1.137.0/scripts/init.sh b/apps/synapse/1.137.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/synapse/1.137.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/synapse/1.137.0/scripts/uninstall.sh b/apps/synapse/1.137.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/synapse/1.137.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/synapse/1.137.0/scripts/upgrade.sh b/apps/synapse/1.137.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/synapse/1.137.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/tangsengdaodao/1.5/envs/default.env b/apps/tangsengdaodao/1.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/tangsengdaodao/1.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/tangsengdaodao/1.5/envs/global.env b/apps/tangsengdaodao/1.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/tangsengdaodao/1.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/tangsengdaodao/1.5/scripts/init.sh b/apps/tangsengdaodao/1.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/tangsengdaodao/1.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/tangsengdaodao/1.5/scripts/uninstall.sh b/apps/tangsengdaodao/1.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/tangsengdaodao/1.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/tangsengdaodao/1.5/scripts/upgrade.sh b/apps/tangsengdaodao/1.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/tangsengdaodao/1.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/teemii/0.8.2/data.yml b/apps/teemii/0.8.2/data.yml index 62a715584..0cd66bc27 100644 --- a/apps/teemii/0.8.2/data.yml +++ b/apps/teemii/0.8.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/teemii" + - default: "./data" edit: true envKey: TEEMII_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/teemii/0.8.2/docker-compose.yml b/apps/teemii/0.8.2/docker-compose.yml index 1fe8c51e1..5b4930091 100644 --- a/apps/teemii/0.8.2/docker-compose.yml +++ b/apps/teemii/0.8.2/docker-compose.yml @@ -13,9 +13,6 @@ 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} environment: - VITE_APP_PORT=80 teemii-backend: @@ -26,9 +23,6 @@ services: restart: always networks: - 1panel-network - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TEEMII_ROOT_PATH}/data:/data environment: diff --git a/apps/teemii/0.8.2/envs/default.env b/apps/teemii/0.8.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/teemii/0.8.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/teemii/0.8.2/envs/global.env b/apps/teemii/0.8.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/teemii/0.8.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/teemii/0.8.2/scripts/init.sh b/apps/teemii/0.8.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/teemii/0.8.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/teemii/0.8.2/scripts/uninstall.sh b/apps/teemii/0.8.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/teemii/0.8.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/teemii/0.8.2/scripts/upgrade.sh b/apps/teemii/0.8.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/teemii/0.8.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/telegram-bot-api/9.2/data.yml b/apps/telegram-bot-api/9.2/data.yml index 9facd808f..79ea529e8 100644 --- a/apps/telegram-bot-api/9.2/data.yml +++ b/apps/telegram-bot-api/9.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/telegram-bot-api" + - default: "./data" edit: true envKey: TELEGRAM_BOT_API_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/telegram-bot-api/9.2/docker-compose.yml b/apps/telegram-bot-api/9.2/docker-compose.yml index d57381972..8619b7f82 100644 --- a/apps/telegram-bot-api/9.2/docker-compose.yml +++ b/apps/telegram-bot-api/9.2/docker-compose.yml @@ -14,9 +14,6 @@ services: ports: - ${PANEL_APP_PORT_HTTPS}:8081 - ${PANEL_APP_PORT_HTTP}:8082 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TELEGRAM_BOT_API_ROOT_PATH}/data:/var/lib/telegram-bot-api - ${TELEGRAM_BOT_API_ROOT_PATH}/logs:/var/log/telegram-bot-api diff --git a/apps/telegram-bot-api/9.2/envs/default.env b/apps/telegram-bot-api/9.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/telegram-bot-api/9.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/telegram-bot-api/9.2/envs/global.env b/apps/telegram-bot-api/9.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/telegram-bot-api/9.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/telegram-bot-api/9.2/scripts/init.sh b/apps/telegram-bot-api/9.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/telegram-bot-api/9.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/telegram-bot-api/9.2/scripts/uninstall.sh b/apps/telegram-bot-api/9.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/telegram-bot-api/9.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/telegram-bot-api/9.2/scripts/upgrade.sh b/apps/telegram-bot-api/9.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/telegram-bot-api/9.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/tissue/1.7.5/data.yml b/apps/tissue/1.7.5/data.yml index 41c598bc6..6789d72f9 100644 --- a/apps/tissue/1.7.5/data.yml +++ b/apps/tissue/1.7.5/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/tissue" + - default: "./data" edit: true envKey: TISSUE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/tissue/1.7.5/docker-compose.yml b/apps/tissue/1.7.5/docker-compose.yml index 827e79233..458ca3d45 100644 --- a/apps/tissue/1.7.5/docker-compose.yml +++ b/apps/tissue/1.7.5/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:9193 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TISSUE_ROOT_PATH}/config:/app/config - ${TISSUE_ROOT_PATH}/video:/data/video diff --git a/apps/tissue/1.7.5/envs/default.env b/apps/tissue/1.7.5/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/tissue/1.7.5/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/tissue/1.7.5/envs/global.env b/apps/tissue/1.7.5/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/tissue/1.7.5/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/tissue/1.7.5/scripts/init.sh b/apps/tissue/1.7.5/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/tissue/1.7.5/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/tissue/1.7.5/scripts/uninstall.sh b/apps/tissue/1.7.5/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/tissue/1.7.5/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/tissue/1.7.5/scripts/upgrade.sh b/apps/tissue/1.7.5/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/tissue/1.7.5/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/topiam-ce/2.0.0/data.yml b/apps/topiam-ce/2.0.0/data.yml index af45c5a5e..4fbe01ab2 100644 --- a/apps/topiam-ce/2.0.0/data.yml +++ b/apps/topiam-ce/2.0.0/data.yml @@ -33,7 +33,7 @@ additionalProperties: values: - label: Redis value: redis - - default: "/home/topiam" + - default: "./data" edit: true envKey: TOPIAM_CE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/topiam-ce/2.0.0/docker-compose.yml b/apps/topiam-ce/2.0.0/docker-compose.yml index 0769c264d..8d45e8aba 100644 --- a/apps/topiam-ce/2.0.0/docker-compose.yml +++ b/apps/topiam-ce/2.0.0/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:1898 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TOPIAM_CE_ROOT_PATH}/logs:/opt/topiam/logs environment: diff --git a/apps/topiam-ce/2.0.0/envs/default.env b/apps/topiam-ce/2.0.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/topiam-ce/2.0.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/topiam-ce/2.0.0/envs/global.env b/apps/topiam-ce/2.0.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/topiam-ce/2.0.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/topiam-ce/2.0.0/scripts/init.sh b/apps/topiam-ce/2.0.0/scripts/init.sh index 935d95e46..c458af546 100644 --- a/apps/topiam-ce/2.0.0/scripts/init.sh +++ b/apps/topiam-ce/2.0.0/scripts/init.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 create directories mkdir -p "$TOPIAM_CE_ROOT_PATH" mkdir -p "$TOPIAM_CE_ROOT_PATH/logs" chmod -R 777 "$TOPIAM_CE_ROOT_PATH" diff --git a/apps/topiam-ce/2.0.0/scripts/uninstall.sh b/apps/topiam-ce/2.0.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/topiam-ce/2.0.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/topiam-ce/2.0.0/scripts/upgrade.sh b/apps/topiam-ce/2.0.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/topiam-ce/2.0.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/traccar/6.9/data.yml b/apps/traccar/6.9/data.yml index 593618f34..6ca5bbfd0 100644 --- a/apps/traccar/6.9/data.yml +++ b/apps/traccar/6.9/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/traccar" + - default: "./data" edit: true envKey: TRACCAR_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/traccar/6.9/docker-compose.yml b/apps/traccar/6.9/docker-compose.yml index 3a70cf21f..f85a89e19 100644 --- a/apps/traccar/6.9/docker-compose.yml +++ b/apps/traccar/6.9/docker-compose.yml @@ -14,9 +14,6 @@ services: hostname: traccar ports: - ${PANEL_APP_PORT_HTTP}:8082 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TRACCAR_ROOT_PATH}/logs:/opt/traccar/logs:rw - ${TRACCAR_ROOT_PATH}/traccar.xml:/opt/traccar/conf/traccar.xml:ro diff --git a/apps/traccar/6.9/envs/default.env b/apps/traccar/6.9/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/traccar/6.9/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/traccar/6.9/envs/global.env b/apps/traccar/6.9/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/traccar/6.9/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/traccar/6.9/scripts/init.sh b/apps/traccar/6.9/scripts/init.sh index 7f45cbee6..f0dd059f4 100644 --- a/apps/traccar/6.9/scripts/init.sh +++ b/apps/traccar/6.9/scripts/init.sh @@ -3,13 +3,6 @@ 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 - cp conf/traccar.xml "${TRACCAR_ROOT_PATH}/traccar.xml" echo "Check Finish." diff --git a/apps/traccar/6.9/scripts/uninstall.sh b/apps/traccar/6.9/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/traccar/6.9/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/traccar/6.9/scripts/upgrade.sh b/apps/traccar/6.9/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/traccar/6.9/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/transmission/4.0.6/.env.sample b/apps/transmission/4.0.6/.env.sample new file mode 100644 index 000000000..9fbfb4c68 --- /dev/null +++ b/apps/transmission/4.0.6/.env.sample @@ -0,0 +1,8 @@ +CONTAINER_NAME="transmission" +DOWNLOAD_PATH="./data/downloads" +PANEL_APP_PORT_HTTP="40154" +PEER_PORT_VALUE="40152" +WATCH_PATH="./data/watch" +WEBUI_USER="" +WEBUI_PWD="" + diff --git a/apps/transmission/4.0.6/data.yml b/apps/transmission/4.0.6/data.yml index 55fa12ae3..2a02d4929 100644 --- a/apps/transmission/4.0.6/data.yml +++ b/apps/transmission/4.0.6/data.yml @@ -1,97 +1,48 @@ additionalProperties: formFields: - - default: "host" - edit: true - envKey: NETWORK_MODE - labelZh: 网络模式 - labelEn: Network Mode - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - - default: 9091 + - default: 40154 edit: true envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 labelEn: WebUI Port + labelZh: 网页端口 required: true rule: paramPort type: number - - default: 51413 + - default: 40152 edit: true - envKey: PANEL_APP_PORT_TORRENTING - labelZh: Torrenting 端口 - labelEn: Torrenting Port + envKey: PEER_PORT_VALUE + labelEn: Peer Port + labelZh: BT端口 required: true rule: paramPort type: number - - default: "/home/transmission" + - default: ./data/watch edit: true - envKey: TRANSMISSION_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path + envKey: WATCH_PATH + labelEn: Watch folder for torrent files + labelZh: 监视种子文件的文件夹 required: true type: text - - default: "admin" + - default: ./data/downloads edit: true - envKey: USER - labelZh: 用户名 - labelEn: User + envKey: DOWNLOAD_PATH + labelEn: Download folder path + labelZh: 下载文件夹路径 required: true type: text - default: "" edit: true - envKey: PASS - labelZh: 密码 - labelEn: Password - required: true + envKey: WEBUI_USER + labelEn: Webui user + labelZh: 网页用户 + required: false + type: text + - default: "" + edit: true + envKey: WEBUI_PWD + labelEn: Webui password + labelZh: 网页密码 + random: false + required: false + rule: paramComplexity type: password - - default: "" - edit: true - envKey: TRANSMISSION_WEB_HOME - labelZh: 第三方 UI 文件夹 - labelEn: Third-party UI folder - required: false - type: text - - default: "" - edit: true - envKey: WHITELIST - labelZh: IP 白名单 - labelEn: Whitelist - required: false - type: text - - default: "" - edit: true - envKey: HOST_WHITELIST - labelZh: 主机白名单 - labelEn: Host Whitelist - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/apps/transmission/4.0.6/docker-compose.yml b/apps/transmission/4.0.6/docker-compose.yml index 85cce9491..0903342e5 100644 --- a/apps/transmission/4.0.6/docker-compose.yml +++ b/apps/transmission/4.0.6/docker-compose.yml @@ -1,32 +1,31 @@ -networks: - 1panel-network: - external: true - services: transmission: - image: linuxserver/transmission:4.0.6 container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:9091 - - ${PANEL_APP_PORT_TORRENTING} - - ${PANEL_APP_PORT_TORRENTING}/udp - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - "${PANEL_APP_PORT_HTTP}:9091" + - "${PEER_PORT_VALUE}:${PEER_PORT_VALUE}" + - "${PEER_PORT_VALUE}:${PEER_PORT_VALUE}/udp" volumes: - - ${TRANSMISSION_ROOT_PATH}/themes:/themes - - ${TRANSMISSION_ROOT_PATH}/config:/config - - ${TRANSMISSION_ROOT_PATH}/downloads:/downloads - - ${TRANSMISSION_ROOT_PATH}/watch:/watch - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - "./data/config:/config" + - "${DOWNLOAD_PATH}:/downloads" + - "${WATCH_PATH}:/watch" environment: - PUID=1000 - PGID=1000 - - PEERPORT= ${PANEL_APP_PORT_TORRENTING} - TZ=Asia/Shanghai + - TRANSMISSION_WEB_HOME= #optional + - USER=${WEBUI_USER} + - PASS=${WEBUI_PWD} + - WHITELIST= #optional + - PEERPORT=${PEER_PORT_VALUE} + - HOST_WHITELIST= #optional + image: linuxserver/transmission:4.0.6 + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/transmission/4.0.6/envs/default.env b/apps/transmission/4.0.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/transmission/4.0.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/transmission/4.0.6/envs/global.env b/apps/transmission/4.0.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/transmission/4.0.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/transmission/4.0.6/scripts/init.sh b/apps/transmission/4.0.6/scripts/init.sh deleted file mode 100644 index b2e1da94a..000000000 --- a/apps/transmission/4.0.6/scripts/init.sh +++ /dev/null @@ -1,53 +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 - - mkdir -p "$TRANSMISSION_ROOT_PATH/downloads" - mkdir -p "$TRANSMISSION_ROOT_PATH/downloads/complete" - mkdir -p "$TRANSMISSION_ROOT_PATH/downloads/incomplete" - - # setup-2 install theme - if [ ! -d "$TRANSMISSION_ROOT_PATH/themes" ]; then - mkdir -p "$TRANSMISSION_ROOT_PATH/themes" - - if command -v unzip >/dev/null 2>&1; then - unzip -o themes/flood-for-transmission.zip -d "$TRANSMISSION_ROOT_PATH/themes" - UNZIP_SUCCESS=$? - elif command -v tar >/dev/null 2>&1; then - tar -xf themes/flood-for-transmission.zip -C "$TRANSMISSION_ROOT_PATH/themes" - UNZIP_SUCCESS=$? - else - echo "Warning: Neither 'unzip' nor 'tar' is installed. Skipping theme extraction." - UNZIP_SUCCESS=1 - fi - - if [ $UNZIP_SUCCESS -eq 0 ]; then - echo "Theme successfully extracted." - - if grep -q "^TRANSMISSION_WEB_HOME=" .env; then - sed -i 's|^TRANSMISSION_WEB_HOME=.*|TRANSMISSION_WEB_HOME=/themes/flood-for-transmission|' .env - else - echo "TRANSMISSION_WEB_HOME=/themes/flood-for-transmission" >> .env - fi - else - echo "Warning: Failed to extract the theme archive. Proceeding without extracted theme." - fi - else - echo "Themes directory already exists. Skipping extraction." - fi - - chown -R 1000:1000 "$TRANSMISSION_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/transmission/4.0.6/scripts/uninstall.sh b/apps/transmission/4.0.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/transmission/4.0.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/transmission/4.0.6/scripts/upgrade.sh b/apps/transmission/4.0.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/transmission/4.0.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/transmission/4.0.6/themes/flood-for-transmission.zip b/apps/transmission/4.0.6/themes/flood-for-transmission.zip deleted file mode 100644 index 0b5af67bb..000000000 Binary files a/apps/transmission/4.0.6/themes/flood-for-transmission.zip and /dev/null differ diff --git a/apps/umami-mysql/2.18.1/data.yml b/apps/umami-mysql/2.18.1/data.yml index ec593ab70..3a6b50c1a 100644 --- a/apps/umami-mysql/2.18.1/data.yml +++ b/apps/umami-mysql/2.18.1/data.yml @@ -19,7 +19,7 @@ additionalProperties: value: mariadb - label: Percona value: percona - - default: "/home/umami" + - default: "./data" edit: true envKey: UMAMI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/umami-mysql/2.18.1/docker-compose.yml b/apps/umami-mysql/2.18.1/docker-compose.yml index d0775fe1e..d66fc250f 100644 --- a/apps/umami-mysql/2.18.1/docker-compose.yml +++ b/apps/umami-mysql/2.18.1/docker-compose.yml @@ -15,9 +15,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:3000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DISABLE_TELEMETRY = 1 - REMOVE_TRAILING_SLASH = 1 diff --git a/apps/umami-mysql/2.18.1/envs/default.env b/apps/umami-mysql/2.18.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/umami-mysql/2.18.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/umami-mysql/2.18.1/envs/global.env b/apps/umami-mysql/2.18.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/umami-mysql/2.18.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/umami-mysql/2.18.1/scripts/init.sh b/apps/umami-mysql/2.18.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/umami-mysql/2.18.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/umami-mysql/2.18.1/scripts/uninstall.sh b/apps/umami-mysql/2.18.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/umami-mysql/2.18.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/umami-mysql/2.18.1/scripts/upgrade.sh b/apps/umami-mysql/2.18.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/umami-mysql/2.18.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/umami/2.18.1/data.yml b/apps/umami/2.18.1/data.yml index e93c2b180..d5964406d 100644 --- a/apps/umami/2.18.1/data.yml +++ b/apps/umami/2.18.1/data.yml @@ -14,7 +14,7 @@ additionalProperties: values: - label: PostgreSQL value: postgresql - - default: "/home/umami" + - default: "./data" edit: true envKey: UMAMI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/umami/2.18.1/docker-compose.yml b/apps/umami/2.18.1/docker-compose.yml index 54429894b..1cf721503 100644 --- a/apps/umami/2.18.1/docker-compose.yml +++ b/apps/umami/2.18.1/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:3000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DISABLE_TELEMETRY = 1 - REMOVE_TRAILING_SLASH = 1 diff --git a/apps/umami/2.18.1/envs/default.env b/apps/umami/2.18.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/umami/2.18.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/umami/2.18.1/envs/global.env b/apps/umami/2.18.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/umami/2.18.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/umami/2.18.1/scripts/init.sh b/apps/umami/2.18.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/umami/2.18.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/umami/2.18.1/scripts/uninstall.sh b/apps/umami/2.18.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/umami/2.18.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/umami/2.18.1/scripts/upgrade.sh b/apps/umami/2.18.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/umami/2.18.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/uptime-kuma/1.23.16/data.yml b/apps/uptime-kuma/1.23.16/data.yml index 26dcfdad1..c39fdb518 100644 --- a/apps/uptime-kuma/1.23.16/data.yml +++ b/apps/uptime-kuma/1.23.16/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/uptime-kuma" + - default: "./data" edit: true envKey: UPTIME_KUMA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/uptime-kuma/1.23.16/docker-compose.yml b/apps/uptime-kuma/1.23.16/docker-compose.yml index e85724114..7c192f0d2 100644 --- a/apps/uptime-kuma/1.23.16/docker-compose.yml +++ b/apps/uptime-kuma/1.23.16/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:3001 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${UPTIME_KUMA_ROOT_PATH}/data:/app/data - /var/run/docker.sock:/var/run/docker.sock diff --git a/apps/uptime-kuma/1.23.16/envs/default.env b/apps/uptime-kuma/1.23.16/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/uptime-kuma/1.23.16/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/uptime-kuma/1.23.16/envs/global.env b/apps/uptime-kuma/1.23.16/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/uptime-kuma/1.23.16/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/uptime-kuma/1.23.16/scripts/init.sh b/apps/uptime-kuma/1.23.16/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/uptime-kuma/1.23.16/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/uptime-kuma/1.23.16/scripts/uninstall.sh b/apps/uptime-kuma/1.23.16/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/uptime-kuma/1.23.16/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/uptime-kuma/1.23.16/scripts/upgrade.sh b/apps/uptime-kuma/1.23.16/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/uptime-kuma/1.23.16/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/uptime-kuma/2.0.0-beta.3/data.yml b/apps/uptime-kuma/2.0.0-beta.3/data.yml index a1f697d37..5c5753fdb 100644 --- a/apps/uptime-kuma/2.0.0-beta.3/data.yml +++ b/apps/uptime-kuma/2.0.0-beta.3/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/uptime-kuma" + - default: "./data" edit: true envKey: UPTIME_KUMA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/uptime-kuma/2.0.0-beta.3/docker-compose.yml b/apps/uptime-kuma/2.0.0-beta.3/docker-compose.yml index 8d63eb3bb..1ed8deafe 100644 --- a/apps/uptime-kuma/2.0.0-beta.3/docker-compose.yml +++ b/apps/uptime-kuma/2.0.0-beta.3/docker-compose.yml @@ -13,9 +13,6 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:3001 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${UPTIME_KUMA_ROOT_PATH}/data:/app/data - /var/run/docker.sock:/var/run/docker.sock diff --git a/apps/uptime-kuma/2.0.0-beta.3/envs/default.env b/apps/uptime-kuma/2.0.0-beta.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/uptime-kuma/2.0.0-beta.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/uptime-kuma/2.0.0-beta.3/envs/global.env b/apps/uptime-kuma/2.0.0-beta.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/uptime-kuma/2.0.0-beta.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/uptime-kuma/2.0.0-beta.3/scripts/init.sh b/apps/uptime-kuma/2.0.0-beta.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/uptime-kuma/2.0.0-beta.3/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/uptime-kuma/2.0.0-beta.3/scripts/uninstall.sh b/apps/uptime-kuma/2.0.0-beta.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/uptime-kuma/2.0.0-beta.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/uptime-kuma/2.0.0-beta.3/scripts/upgrade.sh b/apps/uptime-kuma/2.0.0-beta.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/uptime-kuma/2.0.0-beta.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/v2raya-global/2.2.7.1/data.yml b/apps/v2raya-global/2.2.7.1/data.yml index 408149549..a196a1ec0 100644 --- a/apps/v2raya-global/2.2.7.1/data.yml +++ b/apps/v2raya-global/2.2.7.1/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/v2raya" + - default: "./data" edit: true envKey: V2RAYA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/v2raya-global/2.2.7.1/docker-compose.yml b/apps/v2raya-global/2.2.7.1/docker-compose.yml index a70a60b10..5ea18c103 100644 --- a/apps/v2raya-global/2.2.7.1/docker-compose.yml +++ b/apps/v2raya-global/2.2.7.1/docker-compose.yml @@ -14,9 +14,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - 20170-20172:20170-20172 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${V2RAYA_ROOT_PATH}/v2raya:/etc/v2raya - /etc/resolv.conf:/etc/resolv.conf diff --git a/apps/v2raya-global/2.2.7.1/envs/default.env b/apps/v2raya-global/2.2.7.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/v2raya-global/2.2.7.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/v2raya-global/2.2.7.1/envs/global.env b/apps/v2raya-global/2.2.7.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/v2raya-global/2.2.7.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/v2raya-global/2.2.7.1/scripts/init.sh b/apps/v2raya-global/2.2.7.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/v2raya-global/2.2.7.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/v2raya-global/2.2.7.1/scripts/uninstall.sh b/apps/v2raya-global/2.2.7.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/v2raya-global/2.2.7.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/v2raya-global/2.2.7.1/scripts/upgrade.sh b/apps/v2raya-global/2.2.7.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/v2raya-global/2.2.7.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/v2raya/2.2.7.1/data.yml b/apps/v2raya/2.2.7.1/data.yml index 9b089b364..dd05738b9 100644 --- a/apps/v2raya/2.2.7.1/data.yml +++ b/apps/v2raya/2.2.7.1/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/v2raya" + - default: "./data" edit: true envKey: V2RAYA_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/v2raya/2.2.7.1/docker-compose.yml b/apps/v2raya/2.2.7.1/docker-compose.yml index d68c03ede..41ec7b0d7 100644 --- a/apps/v2raya/2.2.7.1/docker-compose.yml +++ b/apps/v2raya/2.2.7.1/docker-compose.yml @@ -15,9 +15,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2017 - 20170-20172:20170-20172 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${V2RAYA_ROOT_PATH}/v2raya:/etc/v2raya environment: diff --git a/apps/v2raya/2.2.7.1/envs/default.env b/apps/v2raya/2.2.7.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/v2raya/2.2.7.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/v2raya/2.2.7.1/envs/global.env b/apps/v2raya/2.2.7.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/v2raya/2.2.7.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/v2raya/2.2.7.1/scripts/init.sh b/apps/v2raya/2.2.7.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/v2raya/2.2.7.1/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/v2raya/2.2.7.1/scripts/uninstall.sh b/apps/v2raya/2.2.7.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/v2raya/2.2.7.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/v2raya/2.2.7.1/scripts/upgrade.sh b/apps/v2raya/2.2.7.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/v2raya/2.2.7.1/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/vertex/stable/.env.sample b/apps/vertex/stable/.env.sample new file mode 100644 index 000000000..9f59c3c3d --- /dev/null +++ b/apps/vertex/stable/.env.sample @@ -0,0 +1,3 @@ +CONTAINER_NAME="vertex" +PANEL_APP_PORT_HTTP="40197" +DATA_PATH="./data" diff --git a/apps/vertex/stable/data.yml b/apps/vertex/stable/data.yml index 64b1dfdf3..423c24341 100644 --- a/apps/vertex/stable/data.yml +++ b/apps/vertex/stable/data.yml @@ -1,17 +1,17 @@ additionalProperties: formFields: - - default: "/home/vertex" - edit: true - envKey: VERTEX_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 3000 + - default: 40197 edit: true envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port + labelEn: Port + labelZh: 端口 required: true rule: paramPort type: number + - default: ./data + edit: true + envKey: DATA_PATH + labelEn: Data folder path + labelZh: 数据文件夹路径 + required: true + type: text diff --git a/apps/vertex/stable/docker-compose.yml b/apps/vertex/stable/docker-compose.yml index e14629ede..668dd93e5 100644 --- a/apps/vertex/stable/docker-compose.yml +++ b/apps/vertex/stable/docker-compose.yml @@ -1,23 +1,20 @@ -networks: - 1panel-network: - external: true - services: vertex: - image: lswl/vertex:stable container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" restart: always networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:3000 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} + - "${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}" volumes: - - ${VERTEX_ROOT_PATH}/data:/vertex + - "${DATA_PATH}:/vertex" environment: - TZ=Asia/Shanghai - - PORT=3000 + - PORT=${PANEL_APP_PORT_HTTP} + image: lswl/vertex:stable + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/vertex/stable/envs/default.env b/apps/vertex/stable/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/vertex/stable/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/vertex/stable/envs/global.env b/apps/vertex/stable/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/vertex/stable/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/vertex/stable/scripts/init.sh b/apps/vertex/stable/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/vertex/stable/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/vertex/stable/scripts/uninstall.sh b/apps/vertex/stable/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/vertex/stable/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/vertex/stable/scripts/upgrade.sh b/apps/vertex/stable/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/vertex/stable/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/watchyourlan/2.1.3/data.yml b/apps/watchyourlan/2.1.3/data.yml index ab4d657dc..9dccce1db 100644 --- a/apps/watchyourlan/2.1.3/data.yml +++ b/apps/watchyourlan/2.1.3/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/watchyourlan" + - default: "./data" edit: true envKey: WATCHYOURLAN_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/watchyourlan/2.1.3/docker-compose.yml b/apps/watchyourlan/2.1.3/docker-compose.yml index 7353f55c6..fbdd5831b 100644 --- a/apps/watchyourlan/2.1.3/docker-compose.yml +++ b/apps/watchyourlan/2.1.3/docker-compose.yml @@ -12,9 +12,6 @@ services: network_mode: host ports: - ${PANEL_APP_PORT_HTTP}:8840 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WATCHYOURLAN_ROOT_PATH}/data:/data/WatchYourLAN environment: diff --git a/apps/watchyourlan/2.1.3/envs/default.env b/apps/watchyourlan/2.1.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/watchyourlan/2.1.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/watchyourlan/2.1.3/envs/global.env b/apps/watchyourlan/2.1.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/watchyourlan/2.1.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/watchyourlan/2.1.3/scripts/init.sh b/apps/watchyourlan/2.1.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/watchyourlan/2.1.3/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/watchyourlan/2.1.3/scripts/uninstall.sh b/apps/watchyourlan/2.1.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/watchyourlan/2.1.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/watchyourlan/2.1.3/scripts/upgrade.sh b/apps/watchyourlan/2.1.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/watchyourlan/2.1.3/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/weblate/5.13.0.1/data.yml b/apps/weblate/5.13.0.1/data.yml index b4ecbde25..3fb4db62c 100644 --- a/apps/weblate/5.13.0.1/data.yml +++ b/apps/weblate/5.13.0.1/data.yml @@ -28,7 +28,7 @@ additionalProperties: values: - label: Redis value: redis - - default: "/home/weblate" + - default: "./data" edit: true envKey: WEBLATE_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/weblate/5.13.0.1/docker-compose.yml b/apps/weblate/5.13.0.1/docker-compose.yml index 76b3732fe..f6cad62b6 100644 --- a/apps/weblate/5.13.0.1/docker-compose.yml +++ b/apps/weblate/5.13.0.1/docker-compose.yml @@ -17,9 +17,6 @@ services: - /run - /tmp read_only: true - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WEBLATE_ROOT_PATH}/data:/app/data - ${WEBLATE_ROOT_PATH}/cache:/app/cache diff --git a/apps/weblate/5.13.0.1/envs/default.env b/apps/weblate/5.13.0.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/weblate/5.13.0.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/weblate/5.13.0.1/envs/global.env b/apps/weblate/5.13.0.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/weblate/5.13.0.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/weblate/5.13.0.1/scripts/init.sh b/apps/weblate/5.13.0.1/scripts/init.sh index 96bd5cb00..ca1e75c6d 100644 --- a/apps/weblate/5.13.0.1/scripts/init.sh +++ b/apps/weblate/5.13.0.1/scripts/init.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 update dir permissions mkdir -p "$WEBLATE_ROOT_PATH" mkdir -p "$WEBLATE_ROOT_PATH/data" mkdir -p "$WEBLATE_ROOT_PATH/cache" diff --git a/apps/weblate/5.13.0.1/scripts/uninstall.sh b/apps/weblate/5.13.0.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/weblate/5.13.0.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/weblate/5.13.0.1/scripts/upgrade.sh b/apps/weblate/5.13.0.1/scripts/upgrade.sh index 96bd5cb00..ca1e75c6d 100644 --- a/apps/weblate/5.13.0.1/scripts/upgrade.sh +++ b/apps/weblate/5.13.0.1/scripts/upgrade.sh @@ -3,14 +3,6 @@ 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 - - # setup-2 update dir permissions mkdir -p "$WEBLATE_ROOT_PATH" mkdir -p "$WEBLATE_ROOT_PATH/data" mkdir -p "$WEBLATE_ROOT_PATH/cache" diff --git a/apps/wechatpadpro/18.6/data.yml b/apps/wechatpadpro/18.6/data.yml index 1e39d08c2..5923a6e26 100644 --- a/apps/wechatpadpro/18.6/data.yml +++ b/apps/wechatpadpro/18.6/data.yml @@ -33,7 +33,7 @@ additionalProperties: values: - label: Redis value: redis - - default: "/home/wechatpadpro" + - default: "./data" edit: true envKey: WECHATPADPRO_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/wechatpadpro/18.6/docker-compose.yml b/apps/wechatpadpro/18.6/docker-compose.yml index 3e2da0974..fcf1a0f20 100644 --- a/apps/wechatpadpro/18.6/docker-compose.yml +++ b/apps/wechatpadpro/18.6/docker-compose.yml @@ -14,9 +14,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - ${PANEL_APP_PORT_WECHAT}:${PANEL_APP_PORT_WECHAT} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WECHATPADPRO_ROOT_PATH}/.env:/app/.env - ${WECHATPADPRO_ROOT_PATH}/config:/app/config diff --git a/apps/wechatpadpro/18.6/envs/default.env b/apps/wechatpadpro/18.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/wechatpadpro/18.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/wechatpadpro/18.6/envs/global.env b/apps/wechatpadpro/18.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/wechatpadpro/18.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/wechatpadpro/18.6/scripts/init.sh b/apps/wechatpadpro/18.6/scripts/init.sh index a1a79637f..6efa9be76 100644 --- a/apps/wechatpadpro/18.6/scripts/init.sh +++ b/apps/wechatpadpro/18.6/scripts/init.sh @@ -3,16 +3,8 @@ 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 - mkdir -p "$WECHATPADPRO_ROOT_PATH" - # WECHATPADPRO_ROOT_PATH/.env 创建空文件 touch "$WECHATPADPRO_ROOT_PATH/.env" diff --git a/apps/wechatpadpro/18.6/scripts/uninstall.sh b/apps/wechatpadpro/18.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/wechatpadpro/18.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/wechatpadpro/18.6/scripts/upgrade.sh b/apps/wechatpadpro/18.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/wechatpadpro/18.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/windows/4.35/envs/default.env b/apps/windows/4.35/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/windows/4.35/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/windows/4.35/envs/global.env b/apps/windows/4.35/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/windows/4.35/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/windows/4.35/scripts/init.sh b/apps/windows/4.35/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/windows/4.35/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/windows/4.35/scripts/uninstall.sh b/apps/windows/4.35/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/windows/4.35/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/windows/4.35/scripts/upgrade.sh b/apps/windows/4.35/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/windows/4.35/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/wiseflow/0.3.0/data.yml b/apps/wiseflow/0.3.0/data.yml index c87d0e335..b2123d463 100644 --- a/apps/wiseflow/0.3.0/data.yml +++ b/apps/wiseflow/0.3.0/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/wiseflow" + - default: "./data" edit: true envKey: WISEFLOW_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/wiseflow/0.3.0/docker-compose.yml b/apps/wiseflow/0.3.0/docker-compose.yml index 4759d67a9..74f7e8aac 100644 --- a/apps/wiseflow/0.3.0/docker-compose.yml +++ b/apps/wiseflow/0.3.0/docker-compose.yml @@ -16,9 +16,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8090 - ${PANEL_APP_PORT_BACKEND}:8077 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WISEFLOW_ROOT_PATH}/pb_data:/app/pb/pb_data - ${WISEFLOW_ROOT_PATH}/data:/app/works_data diff --git a/apps/wiseflow/0.3.0/envs/default.env b/apps/wiseflow/0.3.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/wiseflow/0.3.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/wiseflow/0.3.0/envs/global.env b/apps/wiseflow/0.3.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/wiseflow/0.3.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/wiseflow/0.3.0/scripts/init.sh b/apps/wiseflow/0.3.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/wiseflow/0.3.0/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/wiseflow/0.3.0/scripts/uninstall.sh b/apps/wiseflow/0.3.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/wiseflow/0.3.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/wiseflow/0.3.0/scripts/upgrade.sh b/apps/wiseflow/0.3.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/wiseflow/0.3.0/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/wukongim/1.2/.env.sample b/apps/wukongim/1.2.6/.env.sample similarity index 100% rename from apps/wukongim/1.2/.env.sample rename to apps/wukongim/1.2.6/.env.sample diff --git a/apps/wukongim/1.2.6/data.yml b/apps/wukongim/1.2.6/data.yml index 201cda9d4..e41b7cad7 100644 --- a/apps/wukongim/1.2.6/data.yml +++ b/apps/wukongim/1.2.6/data.yml @@ -1,47 +1,49 @@ additionalProperties: formFields: - - default: "/home/wukongim" + - default: "" edit: true - envKey: WUKONGIM_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path + envKey: EXTERNAL_IP + labelEn: ipAddress + labelZh: 外部访问 IP required: true type: text - - default: 5300 + - default: "5001" edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port + envKey: PANEL_APP_PORT_WK_API + labelEn: WuKongIM api port + labelZh: 悟空 IM api 端口 required: true rule: paramPort type: number - - default: 5001 - envKey: PANEL_APP_PORT_WK_API - labelZh: API 端口 - labelEn: API port - required: true - type: number - - default: 5100 + - default: "5100" + edit: true envKey: PANEL_APP_PORT_WK_TCP - labelZh: TCP端口 - labelEn: Tcp port + labelEn: WuKongIM tcp port + labelZh: 悟空 IM TCP 端口 required: true + rule: paramPort type: number - - default: 5200 + - default: "5200" + edit: true envKey: PANEL_APP_PORT_WK_WS - labelZh: WebSocket 端口 - labelEn: WebSocket port + labelEn: WuKongIM ws port + labelZh: 悟空 IM WS 端口 required: true + rule: paramPort type: number - - default: 5172 + - default: "5300" + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: WuKongIM web port + labelZh: 悟空 IM 监控端口 + required: true + rule: paramPort + type: number + - default: "5172" + edit: true envKey: PANEL_APP_PORT_WK_DEMO_SERVER - labelZh: 悟空IM演示端口 labelEn: WuKongIM demo port + labelZh: 悟空 IM demo 端口 required: true + rule: paramPort type: number - - default: "127.0.0.1" - envKey: WK_EXTERNAL_IP - labelZh: 服务器IP - labelEn: Server IP - required: true - type: text diff --git a/apps/wukongim/1.2.6/docker-compose.yml b/apps/wukongim/1.2.6/docker-compose.yml index 5c98da8e0..90a3917ab 100644 --- a/apps/wukongim/1.2.6/docker-compose.yml +++ b/apps/wukongim/1.2.6/docker-compose.yml @@ -1,26 +1,28 @@ +services: + wukongim: + container_name: ${CONTAINER_NAME} + image: "wukongim/wukongim:v1.2.6" + restart: always + ports: + - "${PANEL_APP_PORT_WK_API}:5001" + - "${PANEL_APP_PORT_WK_TCP}:5100" + - "${PANEL_APP_PORT_WK_WS}:5200" + - "${PANEL_APP_PORT_HTTP}:5300" + - "${PANEL_APP_PORT_WK_DEMO_SERVER}:5172" + volumes: + - ./wukongim:/root/wukongim + environment: + - WK_MODE=release + - WK_EXTERNAL_IP=${EXTERNAL_IP} + - WK_CONVERSATION_ON=true + - WK_WEBHOOK_GRPCADDR=tangsengdaodaoserver:6979 + - WK_DATASOURCE_ADDR=http://tangsengdaodaoserver:8090/v1/datasource + - WK_DATASOURCE_CHANNELINFOON=true + - WK_TOKENAUTHON=true + networks: + - 1panel-network + labels: + createdBy: "Apps" networks: 1panel-network: external: true - -services: - wukongim: - image: wukongim/wukongim:v1.2.6 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:5300 - - ${PANEL_APP_PORT_WK_API}:5001 - - ${PANEL_APP_PORT_WK_TCP}:5100 - - ${PANEL_APP_PORT_WK_WS}:5200 - - ${PANEL_APP_PORT_WK_DEMO_SERVER}:5172 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ${WUKONGIM_ROOT_PATH}/wukongim:/root/wukongim - environment: - - WK_MODE=release diff --git a/apps/wukongim/1.2.6/envs/default.env b/apps/wukongim/1.2.6/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/wukongim/1.2.6/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/wukongim/1.2.6/envs/global.env b/apps/wukongim/1.2.6/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/wukongim/1.2.6/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/wukongim/1.2.6/scripts/init.sh b/apps/wukongim/1.2.6/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/wukongim/1.2.6/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/wukongim/1.2.6/scripts/uninstall.sh b/apps/wukongim/1.2.6/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/wukongim/1.2.6/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/wukongim/1.2.6/scripts/upgrade.sh b/apps/wukongim/1.2.6/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/wukongim/1.2.6/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/wukongim/1.2/data.yml b/apps/wukongim/1.2/data.yml deleted file mode 100644 index e41b7cad7..000000000 --- a/apps/wukongim/1.2/data.yml +++ /dev/null @@ -1,49 +0,0 @@ -additionalProperties: - formFields: - - default: "" - edit: true - envKey: EXTERNAL_IP - labelEn: ipAddress - labelZh: 外部访问 IP - required: true - type: text - - default: "5001" - edit: true - envKey: PANEL_APP_PORT_WK_API - labelEn: WuKongIM api port - labelZh: 悟空 IM api 端口 - required: true - rule: paramPort - type: number - - default: "5100" - edit: true - envKey: PANEL_APP_PORT_WK_TCP - labelEn: WuKongIM tcp port - labelZh: 悟空 IM TCP 端口 - required: true - rule: paramPort - type: number - - default: "5200" - edit: true - envKey: PANEL_APP_PORT_WK_WS - labelEn: WuKongIM ws port - labelZh: 悟空 IM WS 端口 - required: true - rule: paramPort - type: number - - default: "5300" - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: WuKongIM web port - labelZh: 悟空 IM 监控端口 - required: true - rule: paramPort - type: number - - default: "5172" - edit: true - envKey: PANEL_APP_PORT_WK_DEMO_SERVER - labelEn: WuKongIM demo port - labelZh: 悟空 IM demo 端口 - required: true - rule: paramPort - type: number diff --git a/apps/wukongim/1.2/docker-compose.yml b/apps/wukongim/1.2/docker-compose.yml deleted file mode 100644 index d40918afc..000000000 --- a/apps/wukongim/1.2/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -services: - wukongim: - container_name: ${CONTAINER_NAME} - image: "registry.cn-shanghai.aliyuncs.com/wukongim/wukongim:v1.2" - restart: always - ports: - - "${PANEL_APP_PORT_WK_API}:5001" - - "${PANEL_APP_PORT_WK_TCP}:5100" - - "${PANEL_APP_PORT_WK_WS}:5200" - - "${PANEL_APP_PORT_HTTP}:5300" - - "${PANEL_APP_PORT_WK_DEMO_SERVER}:5172" - volumes: - - ./wukongim:/root/wukongim - environment: - - WK_MODE=release - - WK_EXTERNAL_IP=${EXTERNAL_IP} - - WK_CONVERSATION_ON=true - - WK_WEBHOOK_GRPCADDR=tangsengdaodaoserver:6979 - - WK_DATASOURCE_ADDR=http://tangsengdaodaoserver:8090/v1/datasource - - WK_DATASOURCE_CHANNELINFOON=true - - WK_TOKENAUTHON=true - networks: - - 1panel-network - labels: - createdBy: "Apps" -networks: - 1panel-network: - external: true diff --git a/apps/wukongim/2.0.5/.env.sample b/apps/wukongim/2.0.5/.env.sample deleted file mode 100644 index e28f4d234..000000000 --- a/apps/wukongim/2.0.5/.env.sample +++ /dev/null @@ -1,9 +0,0 @@ -CONTAINER_NAME="wukongim" -EXTERNAL_IP="1.2.3.4" -PANEL_APP_PORT_COMM=11110 -PANEL_APP_PORT_HTTP=5300 -PANEL_APP_PORT_STATS=9090 -PANEL_APP_PORT_WK_API=5001 -PANEL_APP_PORT_WK_DEMO_SERVER=5172 -PANEL_APP_PORT_WK_TCP=5100 -PANEL_APP_PORT_WK_WS=5200 diff --git a/apps/wukongim/2.0.5/data.yml b/apps/wukongim/2.0.5/data.yml deleted file mode 100644 index 17e545718..000000000 --- a/apps/wukongim/2.0.5/data.yml +++ /dev/null @@ -1,65 +0,0 @@ -additionalProperties: - formFields: - - default: "" - edit: true - envKey: EXTERNAL_IP - labelEn: ipAddress - labelZh: 外部访问 IP - required: true - type: text - - default: "5001" - edit: true - envKey: PANEL_APP_PORT_WK_API - labelEn: WuKongIM api port - labelZh: 悟空 IM api 端口 - required: true - rule: paramPort - type: number - - default: "5100" - edit: true - envKey: PANEL_APP_PORT_WK_TCP - labelEn: WuKongIM tcp port - labelZh: 悟空 IM TCP 端口 - required: true - rule: paramPort - type: number - - default: "5200" - edit: true - envKey: PANEL_APP_PORT_WK_WS - labelEn: WuKongIM ws port - labelZh: 悟空 IM WS 端口 - required: true - rule: paramPort - type: number - - default: "5300" - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: WuKongIM web port - labelZh: 悟空 IM 监控端口 - required: true - rule: paramPort - type: number - - default: "5172" - edit: true - envKey: PANEL_APP_PORT_WK_DEMO_SERVER - labelEn: WuKongIM demo port - labelZh: 悟空 IM demo 端口 - required: true - rule: paramPort - type: number - - default: "11110" - edit: true - envKey: PANEL_APP_PORT_COMM - labelEn: WuKongIM Node Communication Port - labelZh: 悟空 IM 节点通讯端口 - required: true - rule: paramPort - type: number - - default: "9090" - edit: true - envKey: PANEL_APP_PORT_STATS - labelEn: Prometheus port - labelZh: Prometheus 端口 - required: true - rule: paramPort - type: number diff --git a/apps/wukongim/2.0.5/docker-compose.yml b/apps/wukongim/2.0.5/docker-compose.yml deleted file mode 100644 index 80b9c3d08..000000000 --- a/apps/wukongim/2.0.5/docker-compose.yml +++ /dev/null @@ -1,43 +0,0 @@ -services: - wukongim: # WuKongIM服务 - container_name: ${CONTAINER_NAME}-wukongim - image: "registry.cn-shanghai.aliyuncs.com/wukongim/wukongim:v2.0.5-20240925" - environment: - - "WK_CLUSTER_NODEID=1001" - - "WK_CLUSTER_SERVERADDR=${EXTERNAL_IP}:${PANEL_APP_PORT_COMM}" # 节点内部通信请求地址 - - "WK_TRACE_PROMETHEUSAPIURL=http://wukongim-prometheus:9090" # prometheus监控地址 - - "WK_MODE=release" # release模式 - - "WK_EXTERNAL_IP=${EXTERNAL_IP}" # 服务器外网ip - healthcheck: - test: "wget -q -Y off -O /dev/null http://localhost:5001/health > /dev/null 2>&1" - interval: 10s - timeout: 10s - retries: 3 - restart: always - volumes: - - ./wukongim_data:/root/wukongim # 数据挂载到物理机的目录 - ports: - - ${PANEL_APP_PORT_WK_API}:5001 # http api 端口 - - ${PANEL_APP_PORT_WK_TCP}:5100 # tcp端口 - - ${PANEL_APP_PORT_WK_WS}:5200 # websocket端口 - - ${PANEL_APP_PORT_HTTP}:5300 # 管理端端口 - - ${PANEL_APP_PORT_WK_DEMO_SERVER}:5172 # demo端口 - - ${PANEL_APP_PORT_COMM}:11110 # 分布式节点通讯端口 - networks: - - 1panel-network - labels: - createdBy: "Apps" - wukongim-prometheus: # 监控服务 - container_name: ${CONTAINER_NAME}-prometheus - image: "registry.cn-shanghai.aliyuncs.com/wukongim/prometheus:v2.53.1" - volumes: - - "./prometheus.yml:/etc/prometheus/prometheus.yml" - ports: - - "${PANEL_APP_PORT_STATS}:9090" - networks: - - 1panel-network - labels: - createdBy: "Apps" -networks: - 1panel-network: - external: true \ No newline at end of file diff --git a/apps/wukongim/2.0.5/prometheus.yml b/apps/wukongim/2.0.5/prometheus.yml deleted file mode 100644 index 0b29224b5..000000000 --- a/apps/wukongim/2.0.5/prometheus.yml +++ /dev/null @@ -1,9 +0,0 @@ -global: - scrape_interval: 10s - evaluation_interval: 10s -scrape_configs: - - job_name: wukongim1-trace-metrics - static_configs: - - targets: ['wukongim:5300'] - labels: - id: "1001" \ No newline at end of file diff --git a/apps/wukongim/2.2.0-20250426/docker-compose.yml b/apps/wukongim/2.2.0-20250426/docker-compose.yml index 6590c54d2..e3c6ee552 100644 --- a/apps/wukongim/2.2.0-20250426/docker-compose.yml +++ b/apps/wukongim/2.2.0-20250426/docker-compose.yml @@ -1,7 +1,7 @@ services: wukongim: # WuKongIM服务 container_name: ${CONTAINER_NAME}-wukongim - image: wukongim/wukongim:v2.2.0-20250426 + image: "wukongim/wukongim:v2.2.0-20250426" environment: - "WK_CLUSTER_NODEID=1001" - "WK_CLUSTER_SERVERADDR=${EXTERNAL_IP}:${PANEL_APP_PORT_COMM}" # 节点内部通信请求地址 diff --git a/apps/xunlei-cnk3x/3.20.2/data.yml b/apps/xunlei-cnk3x/3.20.2/data.yml index 2395df4ce..ba488727f 100644 --- a/apps/xunlei-cnk3x/3.20.2/data.yml +++ b/apps/xunlei-cnk3x/3.20.2/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "/home/xunlei" + - default: "./data" edit: true envKey: XUNLEI_ROOT_PATH labelZh: 数据持久化路径 diff --git a/apps/xunlei-cnk3x/3.20.2/docker-compose.yml b/apps/xunlei-cnk3x/3.20.2/docker-compose.yml index b13a2aa41..fa64cab2c 100644 --- a/apps/xunlei-cnk3x/3.20.2/docker-compose.yml +++ b/apps/xunlei-cnk3x/3.20.2/docker-compose.yml @@ -13,9 +13,6 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2345 privileged: true - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${XUNLEI_ROOT_PATH}/data:/xunlei/data - ${XUNLEI_ROOT_PATH}/downloads:/xunlei/downloads diff --git a/apps/xunlei-cnk3x/3.20.2/envs/default.env b/apps/xunlei-cnk3x/3.20.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/xunlei-cnk3x/3.20.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/xunlei-cnk3x/3.20.2/envs/global.env b/apps/xunlei-cnk3x/3.20.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/xunlei-cnk3x/3.20.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/xunlei-cnk3x/3.20.2/scripts/init.sh b/apps/xunlei-cnk3x/3.20.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/xunlei-cnk3x/3.20.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/xunlei-cnk3x/3.20.2/scripts/uninstall.sh b/apps/xunlei-cnk3x/3.20.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/xunlei-cnk3x/3.20.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh b/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/yarr/2.4.0/envs/default.env b/apps/yarr/2.4.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/yarr/2.4.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/yarr/2.4.0/envs/global.env b/apps/yarr/2.4.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/yarr/2.4.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/yarr/2.4.0/scripts/init.sh b/apps/yarr/2.4.0/scripts/init.sh deleted file mode 100644 index b4e373186..000000000 --- a/apps/yarr/2.4.0/scripts/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ -f .env ]]; then - source .env - - echo "Check Finish." - -else - echo ".env not found." -fi diff --git a/apps/yarr/2.4.0/scripts/upgrade.sh b/apps/yarr/2.4.0/scripts/upgrade.sh deleted file mode 100644 index b4e373186..000000000 --- a/apps/yarr/2.4.0/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ -f .env ]]; then - source .env - - echo "Check Finish." - -else - echo ".env not found." -fi diff --git a/apps/yarr/2.4.0/data.yml b/apps/yarr/2.5/data.yml similarity index 92% rename from apps/yarr/2.4.0/data.yml rename to apps/yarr/2.5/data.yml index facc5a5b0..c4413a8b6 100644 --- a/apps/yarr/2.4.0/data.yml +++ b/apps/yarr/2.5/data.yml @@ -8,7 +8,7 @@ additionalProperties: required: true rule: paramPort type: number - - default: "/home/yarr" + - default: "./data" edit: true envKey: YARR_ROOT_PATH labelEn: Root Path diff --git a/apps/yarr/2.4.0/docker-compose.yml b/apps/yarr/2.5/docker-compose.yml similarity index 88% rename from apps/yarr/2.4.0/docker-compose.yml rename to apps/yarr/2.5/docker-compose.yml index e907e2de9..0f00bb4c7 100644 --- a/apps/yarr/2.4.0/docker-compose.yml +++ b/apps/yarr/2.5/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: bark: - image: qyg2297248353/yarr:v2.4.0 + image: ghcr.io/nkanaev/yarr:v2.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/zerotier-planet-xubiaolin/1.14.2/data.yml b/apps/zerotier-planet-xubiaolin/1.14.2/data.yml index c742126a4..41303702e 100644 --- a/apps/zerotier-planet-xubiaolin/1.14.2/data.yml +++ b/apps/zerotier-planet-xubiaolin/1.14.2/data.yml @@ -1,28 +1,12 @@ additionalProperties: formFields: - - default: "/home/zerotier-planet" + - default: "./data" edit: true envKey: ZEROTIER_PLANET_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text - - default: "host" - 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: 3443 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/zerotier-planet-xubiaolin/1.14.2/docker-compose.yml b/apps/zerotier-planet-xubiaolin/1.14.2/docker-compose.yml index 3e851d6cb..d072aaa8b 100644 --- a/apps/zerotier-planet-xubiaolin/1.14.2/docker-compose.yml +++ b/apps/zerotier-planet-xubiaolin/1.14.2/docker-compose.yml @@ -9,15 +9,13 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_ZT}:${PANEL_APP_PORT_ZT}/tcp - ${PANEL_APP_PORT_ZT}:${PANEL_APP_PORT_ZT}/udp - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - ${PANEL_APP_PORT_FILE}:${PANEL_APP_PORT_FILE} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ZEROTIER_PLANET_ROOT_PATH}/file:/app/dist - ${ZEROTIER_PLANET_ROOT_PATH}/ztncui:/app/ztncui diff --git a/apps/zerotier-planet-xubiaolin/1.14.2/envs/default.env b/apps/zerotier-planet-xubiaolin/1.14.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/zerotier-planet-xubiaolin/1.14.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/zerotier-planet-xubiaolin/1.14.2/envs/global.env b/apps/zerotier-planet-xubiaolin/1.14.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/zerotier-planet-xubiaolin/1.14.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/zerotier-planet-xubiaolin/1.14.2/scripts/init.sh b/apps/zerotier-planet-xubiaolin/1.14.2/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/zerotier-planet-xubiaolin/1.14.2/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/zerotier-planet-xubiaolin/1.14.2/scripts/uninstall.sh b/apps/zerotier-planet-xubiaolin/1.14.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/zerotier-planet-xubiaolin/1.14.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/zerotier-planet-xubiaolin/1.14.2/scripts/upgrade.sh b/apps/zerotier-planet-xubiaolin/1.14.2/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/zerotier-planet-xubiaolin/1.14.2/scripts/upgrade.sh +++ /dev/null @@ -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 diff --git a/apps/zerotier-planet-xubiaolin/README.md b/apps/zerotier-planet-xubiaolin/README.md index 8419d5cfd..5305075fd 100644 --- a/apps/zerotier-planet-xubiaolin/README.md +++ b/apps/zerotier-planet-xubiaolin/README.md @@ -5,10 +5,6 @@ > 默认密码：`password` - - Logo 本项目的 CDN 加速和安全保护由腾讯 EdgeOne 赞助 - - # Docker ZeroTier Planet > 一键部署 ZeroTier Planet 服务器，支持 Docker 容器化部署 @@ -25,7 +21,7 @@ - **4群**：1027678459 ## 📱 微信公众号 -![二维码](assets/wechat.png) +![二维码](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/wechat.png) ## ✨ 功能特性 @@ -38,7 +34,6 @@ ## 📋 目录 -- [0. 托管服务](#0-托管服务) - [1. ZeroTier 介绍](#1-zerotier-介绍) - [2. 为什么要自建 PLANET 服务器](#2-为什么要自建-planet-服务器) - [3. 开始安装](#3-开始安装) @@ -65,39 +60,6 @@ --- -## 0. 托管服务 - -### 0.1 自运营容器服务 - -**寻找便捷的解决方案？** - -我们提供专业的托管服务： - -| 服务项目 | 详情 | -|---------|------| -| **试用期** | 免费试用 3 天 | -| **年费** | 仅需 99￥ | -| **带宽** | 高速带宽 300Mbit | -| **流量政策** | 每月 100G 转发流量，P2P 连接后不计流量，超出后每 10 元 100G | -| **机房** | 优质线路：宁波电信机房 | -| **联系方式** | Telegram：[https://t.me/uxkram](https://t.me/uxkram) 或加入 QQ 群咨询群主 | - -**测速图如下：** - -宁波机房测速图 - -### 0.2 雨云容器服务 - -[![通过雨云一键部署](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6215?ref=220429) - -### 0.3 微信公众号 - -欢迎关注公众号获取最新动态和技术分享 - -微信公众号二维码 - ---- - ## 1. ZeroTier 介绍 `ZeroTier` 是一款强大的 P2P VPN 工具，它能让你在互联网上搭建属于自己的虚拟局域网。通过它，你可以轻松实现远程访问家中设备的需求 - 比如在公司用手机直接访问家里的 NAS。最重要的是，设备之间是点对点直连的，无需经过中转服务器，既保证了速度，又提升了安全性。 @@ -108,7 +70,7 @@ 简单来说，`ZeroTier` 就像是一个跨越互联网的"虚拟交换机"，让分布在世界各地的设备，都能像在同一个局域网内一样方便地相互访问。 -![zerotier](assets/zerotier-network.png) +![zerotier](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/zerotier-network.png) ### ZeroTier 网络中的关键概念 @@ -242,7 +204,7 @@ cd docker-zerotier-planet 4. **安装成功标志：** -![install-finish](./assets/install_finish.png) +![install-finish](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/install_finish.png) ### 3.4 下载 planet 文件 @@ -261,7 +223,7 @@ cd docker-zerotier-planet 访问 `http://ip:3443` 进入 controller 页面 -![ui](assets/ztncui.png) +![ui](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/ztncui.png) **默认登录信息：** - 用户名：`admin` @@ -274,19 +236,19 @@ cd docker-zerotier-planet 3. 输入一个便于识别的网络名称，其他选项可保持默认 4. 点击 "Create Network" 按钮完成创建 -![ui](assets/ztncui_create_net.png) +![ui](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/ztncui_create_net.png) 创建成功后系统会自动生成一个网络 ID，这个 ID 在后续客户端配置时会用到，请记录下来。 -![ui](assets/ztncui_net_id.png) +![ui](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/ztncui_net_id.png) #### 3.5.3 分配网络 IP 1. 选中 "Easy Setup" -![assign_id](./assets/easy_setup.png) +![assign_id](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/easy_setup.png) 2. 生成 IP 范围 -![ip_addr](./assets/network_addr.png) +![ip_addr](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/network_addr.png) --- @@ -308,10 +270,10 @@ ZeroTier 支持多种主流操作系统的客户端，包括： #### 步骤 3：重启服务 1. 按 `Win + S` 搜索 "服务" -![ui](assets/service.png) +![ui](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/service.png) 2. 找到 ZeroTier One，并且重启服务 -![ui](assets/restart_service.png) +![ui](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/restart_service.png) #### 步骤 4：加入网络 使用管理员身份打开 PowerShell，执行如下命令： @@ -327,11 +289,11 @@ PS C:\Windows\system32> #### 步骤 5：授权设备 登录管理后台可以看到有个新的客户端，勾选 `Authorized` 即可 -![ui](assets/join_net.png) +![ui](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/join_net.png) IP assignment 里面会出现 ZeroTier 的内网 IP -![ip](./assets/allow_devices.png) +![ip](https://cdn.jsdmirror.com/gh/xubiaolin/docker-zerotier-planet@master/assets/allow_devices.png) #### 步骤 6：验证连接 执行如下命令验证连接状态： @@ -562,7 +524,7 @@ services: 如果觉得本项目对您有帮助，欢迎通过扫描下方赞赏码捐助项目 :) -donate +donate --- diff --git a/apps/zerotier-planet-xubiaolin/data.yml b/apps/zerotier-planet-xubiaolin/data.yml index b035ef351..e6404d1d1 100644 --- a/apps/zerotier-planet-xubiaolin/data.yml +++ b/apps/zerotier-planet-xubiaolin/data.yml @@ -11,5 +11,5 @@ additionalProperties: crossVersionUpdate: true limit: 0 website: https://www.zerotier.com/ - github: https://github.com/zerotier/ZeroTierOne/ + github: https://github.com/xubiaolin/docker-zerotier-planet/ document: https://docs.zerotier.com/ \ No newline at end of file diff --git a/apps/ztncui/1.2.18/data.yml b/apps/ztncui/1.2.18/data.yml index 94522b065..9d752846d 100644 --- a/apps/ztncui/1.2.18/data.yml +++ b/apps/ztncui/1.2.18/data.yml @@ -1,28 +1,12 @@ additionalProperties: formFields: - - default: "/home/ztncui" + - default: "./data" edit: true envKey: ZTNCUI_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true type: text - - default: "host" - 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: 3000 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/apps/ztncui/1.2.18/docker-compose.yml b/apps/ztncui/1.2.18/docker-compose.yml index e0f7a95fb..2612a1454 100644 --- a/apps/ztncui/1.2.18/docker-compose.yml +++ b/apps/ztncui/1.2.18/docker-compose.yml @@ -9,15 +9,13 @@ services: labels: createdBy: "Apps" restart: always - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API}/tcp - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API}/udp - ${PANEL_APP_PORT_FILE}:3180 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ZTNCUI_ROOT_PATH}/ztncui:/opt/key-networks/ztncui/etc - ${ZTNCUI_ROOT_PATH}/zerotier-one:/var/lib/zerotier-one diff --git a/apps/ztncui/1.2.18/envs/default.env b/apps/ztncui/1.2.18/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/apps/ztncui/1.2.18/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/apps/ztncui/1.2.18/envs/global.env b/apps/ztncui/1.2.18/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/apps/ztncui/1.2.18/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/apps/ztncui/1.2.18/scripts/init.sh b/apps/ztncui/1.2.18/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ztncui/1.2.18/scripts/init.sh +++ /dev/null @@ -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 diff --git a/apps/ztncui/1.2.18/scripts/uninstall.sh b/apps/ztncui/1.2.18/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/ztncui/1.2.18/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/ztncui/1.2.18/scripts/upgrade.sh b/apps/ztncui/1.2.18/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/apps/ztncui/1.2.18/scripts/upgrade.sh +++ /dev/null @@ -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