From 1c4b71fb436abb55d8affbc6408dd507e78387d0 Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Mon, 28 Apr 2025 10:41:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=20Homarr=201.18.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Meng Sen --- homarr/0.15.10/data.yml | 4 ++-- homarr/0.15.10/docker-compose.yml | 2 +- homarr/1.18.1/data.yml | 24 ++++++++++++++++++++++++ homarr/1.18.1/docker-compose.yml | 20 ++++++++++++++++++++ homarr/1.18.1/envs/default.env | 2 ++ homarr/1.18.1/envs/global.env | 2 ++ homarr/1.18.1/scripts/init.sh | 17 +++++++++++++++++ homarr/1.18.1/scripts/uninstall.sh | 10 ++++++++++ homarr/1.18.1/scripts/upgrade.sh | 17 +++++++++++++++++ homarr/README.md | 10 ++++++++++ homarr/data.yml | 2 +- 11 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 homarr/1.18.1/data.yml create mode 100644 homarr/1.18.1/docker-compose.yml create mode 100644 homarr/1.18.1/envs/default.env create mode 100644 homarr/1.18.1/envs/global.env create mode 100644 homarr/1.18.1/scripts/init.sh create mode 100644 homarr/1.18.1/scripts/uninstall.sh create mode 100644 homarr/1.18.1/scripts/upgrade.sh diff --git a/homarr/0.15.10/data.yml b/homarr/0.15.10/data.yml index d4f817f91..f0f6d4264 100644 --- a/homarr/0.15.10/data.yml +++ b/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/homarr/0.15.10/docker-compose.yml b/homarr/0.15.10/docker-compose.yml index f9c4101fe..9c10191f1 100644 --- a/homarr/0.15.10/docker-compose.yml +++ b/homarr/0.15.10/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: - baota: + homarr: image: ghcr.io/ajnart/homarr:0.15.10 container_name: ${CONTAINER_NAME} labels: diff --git a/homarr/1.18.1/data.yml b/homarr/1.18.1/data.yml new file mode 100644 index 000000000..67b5feac2 --- /dev/null +++ b/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/homarr/1.18.1/docker-compose.yml b/homarr/1.18.1/docker-compose.yml new file mode 100644 index 000000000..d8af35842 --- /dev/null +++ b/homarr/1.18.1/docker-compose.yml @@ -0,0 +1,20 @@ +networks: + 1panel-network: + external: true + +services: + homarr: + image: ghcr.io/ajnart/homarr:0.15.10 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + network_mode: ${NETWORK_MODE} + 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}/appdata:/appdata diff --git a/homarr/1.18.1/envs/default.env b/homarr/1.18.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/homarr/1.18.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/homarr/1.18.1/envs/global.env b/homarr/1.18.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/homarr/1.18.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/homarr/1.18.1/scripts/init.sh b/homarr/1.18.1/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/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/homarr/1.18.1/scripts/uninstall.sh b/homarr/1.18.1/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/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/homarr/1.18.1/scripts/upgrade.sh b/homarr/1.18.1/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/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/homarr/README.md b/homarr/README.md index 476250514..344acbf45 100644 --- a/homarr/README.md +++ b/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/homarr/data.yml b/homarr/data.yml index 1c57a4436..80f35275e 100644 --- a/homarr/data.yml +++ b/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/