diff --git a/.github/renovate.json b/.github/renovate.json index 159f779e7..602c829c0 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -374,6 +374,18 @@ "apps/lucky/2.*.*/*.yml" ], "allowedVersions": "<3.0.0" + }, + { + "matchFileNames": [ + "apps/ech0/3.*.*/*.yml" + ], + "allowedVersions": "<4.0.0" + }, + { + "matchFileNames": [ + "apps/omnibox/1.*.*/*.yml" + ], + "allowedVersions": "<2.0.0" } ], "prCreation": "immediate" diff --git a/apps/ech0/4.0.0/data.yml b/apps/ech0/4.0.0/data.yml new file mode 100644 index 000000000..3311637f0 --- /dev/null +++ b/apps/ech0/4.0.0/data.yml @@ -0,0 +1,39 @@ +additionalProperties: + formFields: + - default: "/home/ech0" + edit: true + envKey: ECH0_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 6277 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 6278 + edit: true + envKey: PANEL_APP_PORT_API + labelZh: API 端口 + labelEn: API port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: JWT_SECRET + labelZh: JWT 密钥 + labelEn: JWT Secret + required: true + type: text + - default: "" + edit: true + envKey: HTTP_PROXY + labelZh: 网络代理 + labelEn: Network Proxy + required: false + type: text diff --git a/apps/ech0/4.0.0/docker-compose.yml b/apps/ech0/4.0.0/docker-compose.yml new file mode 100644 index 000000000..a932ff020 --- /dev/null +++ b/apps/ech0/4.0.0/docker-compose.yml @@ -0,0 +1,25 @@ +networks: + 1panel-network: + external: true + +services: + app_name: + image: sn0wl1n/ech0:v4.0.0 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:6277 + - ${PANEL_APP_PORT_API}:6278 + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${ECH0_ROOT_PATH}/data:/app/data + - ${ECH0_ROOT_PATH}/backup:/app/backup + environment: + - TZ=Asia/Shanghai + - HTTPS_PROXY=${HTTP_PROXY} diff --git a/apps/ech0/4.0.0/envs/default.env b/apps/ech0/4.0.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/ech0/4.0.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/ech0/4.0.0/envs/global.env b/apps/ech0/4.0.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/ech0/4.0.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/ech0/4.0.0/scripts/init.sh b/apps/ech0/4.0.0/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/ech0/4.0.0/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/ech0/4.0.0/scripts/uninstall.sh b/apps/ech0/4.0.0/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/apps/ech0/4.0.0/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/ech0/4.0.0/scripts/upgrade.sh b/apps/ech0/4.0.0/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/ech0/4.0.0/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/omnibox/2.0.0/data.yml b/apps/omnibox/2.0.0/data.yml new file mode 100644 index 000000000..4c2821e11 --- /dev/null +++ b/apps/omnibox/2.0.0/data.yml @@ -0,0 +1,17 @@ +additionalProperties: + formFields: + - default: "/home/omnibox" + edit: true + envKey: OMNIBOX_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 7023 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number diff --git a/apps/omnibox/2.0.0/docker-compose.yml b/apps/omnibox/2.0.0/docker-compose.yml new file mode 100644 index 000000000..ab3f77d31 --- /dev/null +++ b/apps/omnibox/2.0.0/docker-compose.yml @@ -0,0 +1,22 @@ +networks: + 1panel-network: + external: true + +services: + omnibox: + image: lampon/omnibox:v2.0.0 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:7023 + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${OMNIBOX_ROOT_PATH}/data:/app/data + environment: + - TZ=Asia/Shanghai diff --git a/apps/omnibox/2.0.0/envs/default.env b/apps/omnibox/2.0.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/omnibox/2.0.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/omnibox/2.0.0/envs/global.env b/apps/omnibox/2.0.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/omnibox/2.0.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/omnibox/2.0.0/scripts/init.sh b/apps/omnibox/2.0.0/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/omnibox/2.0.0/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/omnibox/2.0.0/scripts/uninstall.sh b/apps/omnibox/2.0.0/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/apps/omnibox/2.0.0/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/omnibox/2.0.0/scripts/upgrade.sh b/apps/omnibox/2.0.0/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/omnibox/2.0.0/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi