diff --git a/appstore/beszel-agent/0.10.2/.env b/appstore/beszel-agent/0.11.0/.env similarity index 100% rename from appstore/beszel-agent/0.10.2/.env rename to appstore/beszel-agent/0.11.0/.env diff --git a/appstore/beszel-agent/0.10.2/data.yml b/appstore/beszel-agent/0.11.0/data.yml similarity index 100% rename from appstore/beszel-agent/0.10.2/data.yml rename to appstore/beszel-agent/0.11.0/data.yml diff --git a/appstore/beszel-agent/0.10.2/docker-compose.yml b/appstore/beszel-agent/0.11.0/docker-compose.yml similarity index 92% rename from appstore/beszel-agent/0.10.2/docker-compose.yml rename to appstore/beszel-agent/0.11.0/docker-compose.yml index ef79b7b83..5ffadd338 100644 --- a/appstore/beszel-agent/0.10.2/docker-compose.yml +++ b/appstore/beszel-agent/0.11.0/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - LOG_LEVEL=info - PORT=${PANEL_APP_PORT_HTTP:-45876} - image: henrygd/beszel-agent:0.10.2 + image: henrygd/beszel-agent:0.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/appstore/beszel-agent/0.10.2/envs/default.env b/appstore/beszel-agent/0.11.0/envs/default.env similarity index 100% rename from appstore/beszel-agent/0.10.2/envs/default.env rename to appstore/beszel-agent/0.11.0/envs/default.env diff --git a/appstore/beszel-agent/0.10.2/envs/global.env b/appstore/beszel-agent/0.11.0/envs/global.env similarity index 100% rename from appstore/beszel-agent/0.10.2/envs/global.env rename to appstore/beszel-agent/0.11.0/envs/global.env diff --git a/appstore/beszel-agent/0.10.2/scripts/init.sh b/appstore/beszel-agent/0.11.0/scripts/init.sh similarity index 100% rename from appstore/beszel-agent/0.10.2/scripts/init.sh rename to appstore/beszel-agent/0.11.0/scripts/init.sh diff --git a/appstore/beszel-agent/0.10.2/scripts/uninstall.sh b/appstore/beszel-agent/0.11.0/scripts/uninstall.sh similarity index 100% rename from appstore/beszel-agent/0.10.2/scripts/uninstall.sh rename to appstore/beszel-agent/0.11.0/scripts/uninstall.sh diff --git a/appstore/beszel-agent/0.10.2/scripts/upgrade.sh b/appstore/beszel-agent/0.11.0/scripts/upgrade.sh similarity index 100% rename from appstore/beszel-agent/0.10.2/scripts/upgrade.sh rename to appstore/beszel-agent/0.11.0/scripts/upgrade.sh diff --git a/appstore/beszel/0.10.2/.env b/appstore/beszel/0.11.0/.env similarity index 100% rename from appstore/beszel/0.10.2/.env rename to appstore/beszel/0.11.0/.env diff --git a/appstore/beszel/0.10.2/data.yml b/appstore/beszel/0.11.0/data.yml similarity index 100% rename from appstore/beszel/0.10.2/data.yml rename to appstore/beszel/0.11.0/data.yml diff --git a/appstore/beszel/0.10.2/docker-compose.yml b/appstore/beszel/0.11.0/docker-compose.yml similarity index 91% rename from appstore/beszel/0.10.2/docker-compose.yml rename to appstore/beszel/0.11.0/docker-compose.yml index 2dd39f74f..279aeb920 100644 --- a/appstore/beszel/0.10.2/docker-compose.yml +++ b/appstore/beszel/0.11.0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: henrygd/beszel:0.10.2 + image: henrygd/beszel:0.11.0 labels: createdBy: Apps networks: diff --git a/appstore/beszel/0.10.2/envs/default.env b/appstore/beszel/0.11.0/envs/default.env similarity index 100% rename from appstore/beszel/0.10.2/envs/default.env rename to appstore/beszel/0.11.0/envs/default.env diff --git a/appstore/beszel/0.10.2/envs/global.env b/appstore/beszel/0.11.0/envs/global.env similarity index 100% rename from appstore/beszel/0.10.2/envs/global.env rename to appstore/beszel/0.11.0/envs/global.env diff --git a/appstore/beszel/0.10.2/scripts/init.sh b/appstore/beszel/0.11.0/scripts/init.sh similarity index 100% rename from appstore/beszel/0.10.2/scripts/init.sh rename to appstore/beszel/0.11.0/scripts/init.sh diff --git a/appstore/beszel/0.10.2/scripts/uninstall.sh b/appstore/beszel/0.11.0/scripts/uninstall.sh similarity index 100% rename from appstore/beszel/0.10.2/scripts/uninstall.sh rename to appstore/beszel/0.11.0/scripts/uninstall.sh diff --git a/appstore/beszel/0.10.2/scripts/upgrade.sh b/appstore/beszel/0.11.0/scripts/upgrade.sh similarity index 100% rename from appstore/beszel/0.10.2/scripts/upgrade.sh rename to appstore/beszel/0.11.0/scripts/upgrade.sh diff --git a/appstore/dozzle/8.12.12/.env b/appstore/dozzle/8.12.13/.env similarity index 100% rename from appstore/dozzle/8.12.12/.env rename to appstore/dozzle/8.12.13/.env diff --git a/appstore/dozzle/8.12.12/data.yml b/appstore/dozzle/8.12.13/data.yml similarity index 100% rename from appstore/dozzle/8.12.12/data.yml rename to appstore/dozzle/8.12.13/data.yml diff --git a/appstore/dozzle/8.12.12/docker-compose.yml b/appstore/dozzle/8.12.13/docker-compose.yml similarity index 94% rename from appstore/dozzle/8.12.12/docker-compose.yml rename to appstore/dozzle/8.12.13/docker-compose.yml index b009e99fa..dc20a376d 100644 --- a/appstore/dozzle/8.12.12/docker-compose.yml +++ b/appstore/dozzle/8.12.13/docker-compose.yml @@ -20,7 +20,7 @@ services: - /dozzle - healthcheck timeout: 30s - image: amir20/dozzle:v8.12.12 + image: amir20/dozzle:v8.12.13 labels: createdBy: Apps networks: diff --git a/appstore/dozzle/8.12.12/envs/default.env b/appstore/dozzle/8.12.13/envs/default.env similarity index 100% rename from appstore/dozzle/8.12.12/envs/default.env rename to appstore/dozzle/8.12.13/envs/default.env diff --git a/appstore/dozzle/8.12.12/envs/global.env b/appstore/dozzle/8.12.13/envs/global.env similarity index 100% rename from appstore/dozzle/8.12.12/envs/global.env rename to appstore/dozzle/8.12.13/envs/global.env diff --git a/appstore/dozzle/8.12.12/scripts/init.sh b/appstore/dozzle/8.12.13/scripts/init.sh similarity index 100% rename from appstore/dozzle/8.12.12/scripts/init.sh rename to appstore/dozzle/8.12.13/scripts/init.sh diff --git a/appstore/dozzle/8.12.12/scripts/uninstall.sh b/appstore/dozzle/8.12.13/scripts/uninstall.sh similarity index 100% rename from appstore/dozzle/8.12.12/scripts/uninstall.sh rename to appstore/dozzle/8.12.13/scripts/uninstall.sh diff --git a/appstore/dozzle/8.12.12/scripts/upgrade.sh b/appstore/dozzle/8.12.13/scripts/upgrade.sh similarity index 100% rename from appstore/dozzle/8.12.12/scripts/upgrade.sh rename to appstore/dozzle/8.12.13/scripts/upgrade.sh diff --git a/appstore/homarr/0.15.10/.env b/appstore/homarr/0.15.10/.env index 4d1058fc5..ab5a7db42 100644 --- a/appstore/homarr/0.15.10/.env +++ b/appstore/homarr/0.15.10/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -BAOTA_ROOT_PATH=/home/baota +HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 diff --git a/appstore/homarr/0.15.10/data.yml b/appstore/homarr/0.15.10/data.yml index d4f817f91..f0f6d4264 100644 --- a/appstore/homarr/0.15.10/data.yml +++ b/appstore/homarr/0.15.10/data.yml @@ -1,8 +1,8 @@ additionalProperties: formFields: - - default: "/home/baota" + - default: "/home/homarr" edit: true - envKey: BAOTA_ROOT_PATH + envKey: HOMARR_ROOT_PATH labelZh: 数据持久化路径 labelEn: Data persistence path required: true diff --git a/appstore/homarr/0.15.10/docker-compose.yml b/appstore/homarr/0.15.10/docker-compose.yml index db85096f4..3b26c2c66 100644 --- a/appstore/homarr/0.15.10/docker-compose.yml +++ b/appstore/homarr/0.15.10/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - baota: + homarr: container_name: homarr env_file: - ./envs/global.env diff --git a/appstore/homarr/1.18.1/.env b/appstore/homarr/1.18.1/.env new file mode 100644 index 000000000..39cbf2014 --- /dev/null +++ b/appstore/homarr/1.18.1/.env @@ -0,0 +1,9 @@ +# 数据持久化路径 [必填] +HOMARR_ROOT_PATH=/home/homarr + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=7575 + +# 密钥 [必填] +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 + diff --git a/appstore/homarr/1.18.1/data.yml b/appstore/homarr/1.18.1/data.yml new file mode 100644 index 000000000..67b5feac2 --- /dev/null +++ b/appstore/homarr/1.18.1/data.yml @@ -0,0 +1,24 @@ +additionalProperties: + formFields: + - default: "/home/homarr" + edit: true + envKey: HOMARR_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 7575 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: "b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7" + edit: true + envKey: SECRET_ENCRYPTION_KEY + labelZh: 密钥 + labelEn: Secret key + required: true + type: text diff --git a/appstore/homarr/1.18.1/docker-compose.yml b/appstore/homarr/1.18.1/docker-compose.yml new file mode 100644 index 000000000..c9303a621 --- /dev/null +++ b/appstore/homarr/1.18.1/docker-compose.yml @@ -0,0 +1,19 @@ +networks: + 1panel-network: + external: true +services: + homarr: + container_name: homarr + env_file: + - ./envs/global.env + - .env + image: ghcr.io/ajnart/homarr:0.15.10 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:7575 + restart: always + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ${HOMARR_ROOT_PATH}/appdata:/appdata diff --git a/appstore/homarr/1.18.1/envs/default.env b/appstore/homarr/1.18.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/appstore/homarr/1.18.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/appstore/homarr/1.18.1/envs/global.env b/appstore/homarr/1.18.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/appstore/homarr/1.18.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/appstore/homarr/1.18.1/scripts/init.sh b/appstore/homarr/1.18.1/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/homarr/1.18.1/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/homarr/1.18.1/scripts/uninstall.sh b/appstore/homarr/1.18.1/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/homarr/1.18.1/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/homarr/1.18.1/scripts/upgrade.sh b/appstore/homarr/1.18.1/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/homarr/1.18.1/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/homarr/README.md b/appstore/homarr/README.md index 476250514..344acbf45 100644 --- a/appstore/homarr/README.md +++ b/appstore/homarr/README.md @@ -28,6 +28,16 @@ 🚀 与任何主要消费类硬件兼容(x86、Raspberry Pi、旧笔记本电脑......) +## 安装说明 + +> 不支持从 1.0.0 之前的版本直接升级至 1.0.0 及以上版本 + +### 快捷密钥生成 + +```bash +openssl rand -hex 32 +``` + --- ![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/appstore/homarr/data.yml b/appstore/homarr/data.yml index 1c57a4436..80f35275e 100644 --- a/appstore/homarr/data.yml +++ b/appstore/homarr/data.yml @@ -7,7 +7,7 @@ shortDescZh: 一个时尚、现代化的仪表板 shortDescEn: A stylish, modern dashboard type: website - crossVersionUpdate: true + crossVersionUpdate: false limit: 0 website: https://homarr.dev/ github: https://github.com/ajnart/homarr/ diff --git a/dockge/beszel-agent/docker-compose.yml b/dockge/beszel-agent/docker-compose.yml index ef79b7b83..5ffadd338 100644 --- a/dockge/beszel-agent/docker-compose.yml +++ b/dockge/beszel-agent/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - LOG_LEVEL=info - PORT=${PANEL_APP_PORT_HTTP:-45876} - image: henrygd/beszel-agent:0.10.2 + image: henrygd/beszel-agent:0.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/dockge/beszel/docker-compose.yml b/dockge/beszel/docker-compose.yml index 2dd39f74f..279aeb920 100644 --- a/dockge/beszel/docker-compose.yml +++ b/dockge/beszel/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: henrygd/beszel:0.10.2 + image: henrygd/beszel:0.11.0 labels: createdBy: Apps networks: diff --git a/dockge/dozzle/docker-compose.yml b/dockge/dozzle/docker-compose.yml index b009e99fa..dc20a376d 100644 --- a/dockge/dozzle/docker-compose.yml +++ b/dockge/dozzle/docker-compose.yml @@ -20,7 +20,7 @@ services: - /dozzle - healthcheck timeout: 30s - image: amir20/dozzle:v8.12.12 + image: amir20/dozzle:v8.12.13 labels: createdBy: Apps networks: diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 4d1058fc5..ab5a7db42 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -BAOTA_ROOT_PATH=/home/baota +HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index db85096f4..3b26c2c66 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - baota: + homarr: container_name: homarr env_file: - ./envs/global.env diff --git a/dockge/homarr_1_18_1/.env b/dockge/homarr_1_18_1/.env new file mode 100644 index 000000000..39cbf2014 --- /dev/null +++ b/dockge/homarr_1_18_1/.env @@ -0,0 +1,9 @@ +# 数据持久化路径 [必填] +HOMARR_ROOT_PATH=/home/homarr + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=7575 + +# 密钥 [必填] +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 + diff --git a/dockge/homarr_1_18_1/docker-compose.yml b/dockge/homarr_1_18_1/docker-compose.yml new file mode 100644 index 000000000..c9303a621 --- /dev/null +++ b/dockge/homarr_1_18_1/docker-compose.yml @@ -0,0 +1,19 @@ +networks: + 1panel-network: + external: true +services: + homarr: + container_name: homarr + env_file: + - ./envs/global.env + - .env + image: ghcr.io/ajnart/homarr:0.15.10 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:7575 + restart: always + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ${HOMARR_ROOT_PATH}/appdata:/appdata diff --git a/dockge/homarr_1_18_1/envs/default.env b/dockge/homarr_1_18_1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/homarr_1_18_1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/homarr_1_18_1/envs/global.env b/dockge/homarr_1_18_1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/homarr_1_18_1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai