Merge remote-tracking branch 'origin/custom' into custom

This commit is contained in:
新疆萌森软件开发工作室 2025-01-26 11:49:41 +08:00
commit 0c0feab05b
224 changed files with 531 additions and 46 deletions

View File

@ -4,7 +4,7 @@ networks:
services:
halo:
image: halohub/halo:2.20.13
image: halohub/halo:2.20.14
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -4,7 +4,7 @@ networks:
services:
halo:
image: halohub/halo:2.20.13
image: halohub/halo:2.20.14
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -6,7 +6,7 @@ name: immich-machine-learning
services:
immich-machine-learning:
image: ghcr.io/immich-app/immich-machine-learning:v1.125.1
image: ghcr.io/immich-app/immich-machine-learning:v1.125.2
container_name: immich-machine-learning-${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -47,7 +47,7 @@ services:
immich-server:
depends_on:
- immich-pg14-vectors
image: ghcr.io/immich-app/immich-server:v1.125.1
image: ghcr.io/immich-app/immich-server:v1.125.2
container_name: immich-server-${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -6,7 +6,7 @@ name: immich-server
services:
immich-server:
image: ghcr.io/immich-app/immich-server:v1.125.1
image: ghcr.io/immich-app/immich-server:v1.125.2
container_name: immich-server-${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -47,7 +47,7 @@ services:
immich-server:
depends_on:
- immich-pg14-vectors
image: ghcr.io/immich-app/immich-server:v1.125.1
image: ghcr.io/immich-app/immich-server:v1.125.2
container_name: immich-server-${CONTAINER_NAME}
labels:
createdBy: "Apps"
@ -73,7 +73,7 @@ services:
- /etc/localtime:/etc/localtime
immich-machine-learning:
image: ghcr.io/immich-app/immich-machine-learning:v1.125.1
image: ghcr.io/immich-app/immich-machine-learning:v1.125.2
container_name: immich-machine-learning-${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -4,7 +4,7 @@ networks:
services:
jellyfin:
image: jellyfin/jellyfin:10.10.4
image: jellyfin/jellyfin:10.10.5
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -4,7 +4,7 @@ networks:
services:
nezha-dash:
image: hamster1963/nezha-dash:v2.4.0
image: hamster1963/nezha-dash:v2.5.0
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -4,7 +4,7 @@ networks:
services:
onedev:
image: 1dev/server:11.6.11
image: 1dev/server:11.6.12
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -4,7 +4,7 @@ networks:
services:
prowlarr:
image: linuxserver/prowlarr:1.29.2
image: linuxserver/prowlarr:1.30.2
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"

View File

@ -23,7 +23,7 @@ services:
timeout: 10s
retries: 3
rsshub:
image: diygod/rsshub:2025-01-23
image: diygod/rsshub:2025-01-25
container_name: rsshub-${CONTAINER_NAME}
depends_on:
- browserless

View File

@ -0,0 +1,6 @@
# 数据持久化路径 [必填]
APP_NAME_ROOT_PATH=/home/app_name
# WebUI 端口 [必填]
PANEL_APP_PORT_HTTP=8080

View File

@ -0,0 +1,68 @@
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

View File

@ -0,0 +1,17 @@
additionalProperties:
formFields:
- default: "/home/app_name"
edit: true
envKey: APP_NAME_ROOT_PATH
labelZh: 数据持久化路径
labelEn: Data persistence path
required: true
type: text
- default: 8080
edit: true
envKey: PANEL_APP_PORT_HTTP
labelZh: WebUI 端口
labelEn: WebUI port
required: true
rule: paramPort
type: number

View File

@ -0,0 +1,24 @@
networks:
1panel-network:
external: true
services:
glance:
container_name: glance
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
image: glanceapp/glance:v0.6.4
labels:
createdBy: Apps
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:8080
restart: always
volumes:
- ${APP_NAME_ROOT_PATH}/app/glance.yml:/app/glance.yml
- ${APP_NAME_ROOT_PATH}/app/assets:/app/assets
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro

View File

@ -0,0 +1,22 @@
#!/bin/bash
if [ -f .env ]; then
source .env
# setup-1 add default values
CURRENT_DIR=$(pwd)
sed -i '/^ENV_FILE=/d' .env
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 "$APP_NAME_ROOT_PATH"
mkdir -p "$APP_NAME_ROOT_PATH/app"
cp ./conf/glance.yml "$APP_NAME_ROOT_PATH/app/glance.yml"
echo "Check Finish."
else
echo "Error: .env file not found."
fi

View File

@ -0,0 +1,24 @@
#!/bin/bash
if [ -f .env ]; then
source .env
# setup-1 add default values
CURRENT_DIR=$(pwd)
sed -i '/^ENV_FILE=/d' .env
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 "$APP_NAME_ROOT_PATH"
mkdir -p "$APP_NAME_ROOT_PATH/app"
if [ ! -f "$APP_NAME_ROOT_PATH/app/glance.yml" ]; then
cp ./conf/glance.yml "$APP_NAME_ROOT_PATH/app/glance.yml"
fi
echo "Check Finish."
else
echo "Error: .env file not found."
fi

30
appstore/glance/README.md Normal file
View File

@ -0,0 +1,30 @@
# Glance
一个自托管的仪表板,将所有您的订阅源放在一个地方
![Glance](https://file.lifebus.top/imgs/glance_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)
## 小部件
+ RSS 订阅源
+ 子版块帖子
+ 天气
+ 书签
+ 黑客新闻
+ Lobsters
+ 最新特定频道的 YouTube 视频
+ 闹钟
+ 日历
+ 股票
+ iframe
+ Twitch 频道和热门游戏
+ GitHub 发布
+ 代码库概览
+ 站点监控
+ 搜索框
---
![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)

14
appstore/glance/data.yml Normal file
View File

@ -0,0 +1,14 @@
additionalProperties:
key: glance
name: Glance
tags:
- WebSite
- Local
shortDescZh: 一个自托管的仪表板,将所有您的订阅源放在一个地方
shortDescEn: A self-hosted dashboard that puts all your feeds in one place
type: website
crossVersionUpdate: true
limit: 0
website: https://github.com/glanceapp/glance/
github: https://github.com/glanceapp/glance/
document: https://github.com/glanceapp/glance/

BIN
appstore/glance/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

View File

@ -9,7 +9,7 @@ services:
container_name: halo-h2
environment:
- JVM_OPTS=-Xmx256m -Xms256m
image: halohub/halo:2.20.13
image: halohub/halo:2.20.14
labels:
createdBy: Apps
networks:

Some files were not shown because too many files have changed in this diff Show More