diff --git a/appstore/homarr/1.56.0/.env b/appstore/homarr/1.56.1/.env similarity index 100% rename from appstore/homarr/1.56.0/.env rename to appstore/homarr/1.56.1/.env diff --git a/appstore/homarr/1.56.0/data.yml b/appstore/homarr/1.56.1/data.yml similarity index 100% rename from appstore/homarr/1.56.0/data.yml rename to appstore/homarr/1.56.1/data.yml diff --git a/appstore/homarr/1.56.0/docker-compose.yml b/appstore/homarr/1.56.1/docker-compose.yml similarity index 89% rename from appstore/homarr/1.56.0/docker-compose.yml rename to appstore/homarr/1.56.1/docker-compose.yml index 17ecd3f2d..471526398 100644 --- a/appstore/homarr/1.56.0/docker-compose.yml +++ b/appstore/homarr/1.56.1/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.56.0 + image: ghcr.io/homarr-labs/homarr:v1.56.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/homarr/1.56.0/envs/default.env b/appstore/homarr/1.56.1/envs/default.env similarity index 100% rename from appstore/homarr/1.56.0/envs/default.env rename to appstore/homarr/1.56.1/envs/default.env diff --git a/appstore/homarr/1.56.0/envs/global.env b/appstore/homarr/1.56.1/envs/global.env similarity index 100% rename from appstore/homarr/1.56.0/envs/global.env rename to appstore/homarr/1.56.1/envs/global.env diff --git a/appstore/homarr/1.56.0/scripts/init.sh b/appstore/homarr/1.56.1/scripts/init.sh similarity index 100% rename from appstore/homarr/1.56.0/scripts/init.sh rename to appstore/homarr/1.56.1/scripts/init.sh diff --git a/appstore/homarr/1.56.0/scripts/uninstall.sh b/appstore/homarr/1.56.1/scripts/uninstall.sh similarity index 100% rename from appstore/homarr/1.56.0/scripts/uninstall.sh rename to appstore/homarr/1.56.1/scripts/uninstall.sh diff --git a/appstore/homarr/1.56.0/scripts/upgrade.sh b/appstore/homarr/1.56.1/scripts/upgrade.sh similarity index 100% rename from appstore/homarr/1.56.0/scripts/upgrade.sh rename to appstore/homarr/1.56.1/scripts/upgrade.sh diff --git a/appstore/omnibox/2.0.4-lite/.env b/appstore/omnibox/2.0.4-lite/.env new file mode 100644 index 000000000..4148e8dd2 --- /dev/null +++ b/appstore/omnibox/2.0.4-lite/.env @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +OMNIBOX_ROOT_PATH=/home/omnibox + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=7023 + diff --git a/appstore/omnibox/2.0.4-lite/data.yml b/appstore/omnibox/2.0.4-lite/data.yml new file mode 100644 index 000000000..4c2821e11 --- /dev/null +++ b/appstore/omnibox/2.0.4-lite/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/appstore/omnibox/2.0.4-lite/docker-compose.yml b/appstore/omnibox/2.0.4-lite/docker-compose.yml new file mode 100644 index 000000000..8dec7c842 --- /dev/null +++ b/appstore/omnibox/2.0.4-lite/docker-compose.yml @@ -0,0 +1,23 @@ +networks: + 1panel-network: + external: true +services: + omnibox-lite: + container_name: omnibox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - SERVER_PORT=7023 + - DATABASE_TYPE=sqlite + image: lampon/omnibox:v2.0.4-lite + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:7023 + restart: always + volumes: + - ${OMNIBOX_ROOT_PATH}/data:/app/data diff --git a/dockge/homarr_0_16_1/envs/default.env b/appstore/omnibox/2.0.4-lite/envs/default.env similarity index 100% rename from dockge/homarr_0_16_1/envs/default.env rename to appstore/omnibox/2.0.4-lite/envs/default.env diff --git a/dockge/homarr_0_16_1/envs/global.env b/appstore/omnibox/2.0.4-lite/envs/global.env similarity index 100% rename from dockge/homarr_0_16_1/envs/global.env rename to appstore/omnibox/2.0.4-lite/envs/global.env diff --git a/appstore/omnibox/2.0.4-lite/scripts/init.sh b/appstore/omnibox/2.0.4-lite/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/omnibox/2.0.4-lite/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/appstore/omnibox/2.0.4-lite/scripts/uninstall.sh b/appstore/omnibox/2.0.4-lite/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/omnibox/2.0.4-lite/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/appstore/omnibox/2.0.4-lite/scripts/upgrade.sh b/appstore/omnibox/2.0.4-lite/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/omnibox/2.0.4-lite/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/appstore/omnibox/2.0.4/docker-compose.yml b/appstore/omnibox/2.0.4/docker-compose.yml index 8114a263c..bddaca597 100644 --- a/appstore/omnibox/2.0.4/docker-compose.yml +++ b/appstore/omnibox/2.0.4/docker-compose.yml @@ -9,6 +9,8 @@ services: - .env environment: - TZ=Asia/Shanghai + - SERVER_PORT=7023 + - DATABASE_TYPE=sqlite image: lampon/omnibox:v2.0.4 labels: createdBy: Apps diff --git a/appstore/omnibox/README.md b/appstore/omnibox/README.md index ce6876989..3a617c809 100644 --- a/appstore/omnibox/README.md +++ b/appstore/omnibox/README.md @@ -6,6 +6,10 @@ ![](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) +## 安装 + +> v2.0 与 v1.0 数据不互通,请勿跨版本升级 + ## 特性 + 支持采集站、网盘资源在线观看 diff --git a/appstore/omnibox/data.yml b/appstore/omnibox/data.yml index 4e8f14bb2..c4aa88e21 100644 --- a/appstore/omnibox/data.yml +++ b/appstore/omnibox/data.yml @@ -9,7 +9,7 @@ additionalProperties: type: website crossVersionUpdate: true limit: 0 - website: https://hub.docker.com/r/lampon/omnibox/ + website: https://omnibox-doc.pages.dev/ github: https://hub.docker.com/r/lampon/omnibox/ document: https://hub.docker.com/r/lampon/omnibox/ architectures: diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 4610427ed..9370b8091 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 17ecd3f2d..081e2d190 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.56.0 + image: ghcr.io/ajnart/homarr:0.16.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_0_16_1/.env b/dockge/homarr_1_56_1/.env similarity index 67% rename from dockge/homarr_0_16_1/.env rename to dockge/homarr_1_56_1/.env index 9370b8091..4610427ed 100644 --- a/dockge/homarr_0_16_1/.env +++ b/dockge/homarr_1_56_1/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d diff --git a/dockge/homarr_0_16_1/docker-compose.yml b/dockge/homarr_1_56_1/docker-compose.yml similarity index 89% rename from dockge/homarr_0_16_1/docker-compose.yml rename to dockge/homarr_1_56_1/docker-compose.yml index 081e2d190..471526398 100644 --- a/dockge/homarr_0_16_1/docker-compose.yml +++ b/dockge/homarr_1_56_1/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.1 + image: ghcr.io/homarr-labs/homarr:v1.56.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_1_56_1/envs/default.env b/dockge/homarr_1_56_1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/homarr_1_56_1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/homarr_1_56_1/envs/global.env b/dockge/homarr_1_56_1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/homarr_1_56_1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/omnibox/docker-compose.yml b/dockge/omnibox/docker-compose.yml index 8114a263c..bddaca597 100644 --- a/dockge/omnibox/docker-compose.yml +++ b/dockge/omnibox/docker-compose.yml @@ -9,6 +9,8 @@ services: - .env environment: - TZ=Asia/Shanghai + - SERVER_PORT=7023 + - DATABASE_TYPE=sqlite image: lampon/omnibox:v2.0.4 labels: createdBy: Apps diff --git a/dockge/omnibox_2_0_4-lite/.env b/dockge/omnibox_2_0_4-lite/.env new file mode 100644 index 000000000..4148e8dd2 --- /dev/null +++ b/dockge/omnibox_2_0_4-lite/.env @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +OMNIBOX_ROOT_PATH=/home/omnibox + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=7023 + diff --git a/dockge/omnibox_2_0_4-lite/docker-compose.yml b/dockge/omnibox_2_0_4-lite/docker-compose.yml new file mode 100644 index 000000000..8dec7c842 --- /dev/null +++ b/dockge/omnibox_2_0_4-lite/docker-compose.yml @@ -0,0 +1,23 @@ +networks: + 1panel-network: + external: true +services: + omnibox-lite: + container_name: omnibox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - SERVER_PORT=7023 + - DATABASE_TYPE=sqlite + image: lampon/omnibox:v2.0.4-lite + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:7023 + restart: always + volumes: + - ${OMNIBOX_ROOT_PATH}/data:/app/data diff --git a/dockge/omnibox_2_0_4-lite/envs/default.env b/dockge/omnibox_2_0_4-lite/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/omnibox_2_0_4-lite/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/omnibox_2_0_4-lite/envs/global.env b/dockge/omnibox_2_0_4-lite/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/omnibox_2_0_4-lite/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai