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

This commit is contained in:
新疆萌森软件开发工作室 2025-01-27 10:41:45 +08:00
commit 7467a138ae
62 changed files with 28 additions and 21 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -4,7 +4,7 @@ networks:
services: services:
linkding: linkding:
image: sissbruecker/linkding:1.36.0-plus image: sissbruecker/linkding:1.37.0-plus
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
labels: labels:
createdBy: "Apps" createdBy: "Apps"

View File

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

View File

@ -4,7 +4,7 @@ networks:
services: services:
tissue: tissue:
image: chris2s/tissue:1.5.11 image: chris2s/tissue:1.5.12
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
labels: labels:
createdBy: "Apps" createdBy: "Apps"

View File

@ -9,7 +9,7 @@ services:
- .env - .env
environment: environment:
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
image: chris2s/tissue:1.5.11 image: chris2s/tissue:1.5.12
labels: labels:
createdBy: Apps createdBy: Apps
networks: networks:

View File

@ -22,7 +22,7 @@ services:
- ${PANEL_APP_PORT_TORRENTING}/udp - ${PANEL_APP_PORT_TORRENTING}/udp
restart: always restart: always
volumes: volumes:
- ${TRANSMISSION_ROOT_PATH}/ui/themes:/ui/themes - ${TRANSMISSION_ROOT_PATH}/themes:/themes
- ${TRANSMISSION_ROOT_PATH}/config:/config - ${TRANSMISSION_ROOT_PATH}/config:/config
- ${TRANSMISSION_ROOT_PATH}/downloads:/downloads - ${TRANSMISSION_ROOT_PATH}/downloads:/downloads
- ${TRANSMISSION_ROOT_PATH}/watch:/watch - ${TRANSMISSION_ROOT_PATH}/watch:/watch

View File

@ -10,20 +10,19 @@ if [ -f .env ]; then
echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
mkdir -p "$TRANSMISSION_ROOT_PATH"
mkdir -p "$TRANSMISSION_ROOT_PATH/config"
mkdir -p "$TRANSMISSION_ROOT_PATH/downloads" mkdir -p "$TRANSMISSION_ROOT_PATH/downloads"
mkdir -p "$TRANSMISSION_ROOT_PATH/watch" mkdir -p "$TRANSMISSION_ROOT_PATH/downloads/complete"
mkdir -p "$TRANSMISSION_ROOT_PATH/downloads/incomplete"
# setup-2 install theme # setup-2 install theme
if [ ! -d "$TRANSMISSION_ROOT_PATH/ui/themes" ]; then if [ ! -d "$TRANSMISSION_ROOT_PATH/themes" ]; then
mkdir -p "$TRANSMISSION_ROOT_PATH/ui/themes" mkdir -p "$TRANSMISSION_ROOT_PATH/themes"
if command -v unzip >/dev/null 2>&1; then if command -v unzip >/dev/null 2>&1; then
unzip -o themes/flood-for-transmission.zip -d "$TRANSMISSION_ROOT_PATH/ui/themes" unzip -o themes/flood-for-transmission.zip -d "$TRANSMISSION_ROOT_PATH/themes"
UNZIP_SUCCESS=$? UNZIP_SUCCESS=$?
elif command -v tar >/dev/null 2>&1; then elif command -v tar >/dev/null 2>&1; then
tar -xf themes/flood-for-transmission.zip -C "$TRANSMISSION_ROOT_PATH/ui/themes" tar -xf themes/flood-for-transmission.zip -C "$TRANSMISSION_ROOT_PATH/themes"
UNZIP_SUCCESS=$? UNZIP_SUCCESS=$?
else else
echo "Warning: Neither 'unzip' nor 'tar' is installed. Skipping theme extraction." echo "Warning: Neither 'unzip' nor 'tar' is installed. Skipping theme extraction."
@ -34,9 +33,9 @@ if [ -f .env ]; then
echo "Theme successfully extracted." echo "Theme successfully extracted."
if grep -q "^TRANSMISSION_WEB_HOME=" .env; then if grep -q "^TRANSMISSION_WEB_HOME=" .env; then
sed -i 's|^TRANSMISSION_WEB_HOME=.*|TRANSMISSION_WEB_HOME=/ui/themes/flood-for-transmission|' .env sed -i 's|^TRANSMISSION_WEB_HOME=.*|TRANSMISSION_WEB_HOME=/themes/flood-for-transmission|' .env
else else
echo "TRANSMISSION_WEB_HOME=/ui/themes/flood-for-transmission" >> .env echo "TRANSMISSION_WEB_HOME=/themes/flood-for-transmission" >> .env
fi fi
else else
echo "Warning: Failed to extract the theme archive. Proceeding without extracted theme." echo "Warning: Failed to extract the theme archive. Proceeding without extracted theme."
@ -45,6 +44,8 @@ if [ -f .env ]; then
echo "Themes directory already exists. Skipping extraction." echo "Themes directory already exists. Skipping extraction."
fi fi
chown -R 1000:1000 "$TRANSMISSION_ROOT_PATH"
echo "Check Finish." echo "Check Finish."
else else

View File

@ -12,6 +12,12 @@
+ PT刷流 + PT刷流
+ 追剧 + 追剧
## 安装说明
> 默认用户名:`admin`
>
> 默认密码:请在持久化目录下查看`vertex/data/password` 文件中查找
--- ---
![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) ![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)

View File

@ -9,7 +9,7 @@ services:
- .env - .env
environment: environment:
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
image: chris2s/tissue:1.5.11 image: chris2s/tissue:1.5.12
labels: labels:
createdBy: Apps createdBy: Apps
networks: networks:

View File

@ -22,7 +22,7 @@ services:
- ${PANEL_APP_PORT_TORRENTING}/udp - ${PANEL_APP_PORT_TORRENTING}/udp
restart: always restart: always
volumes: volumes:
- ${TRANSMISSION_ROOT_PATH}/ui/themes:/ui/themes - ${TRANSMISSION_ROOT_PATH}/themes:/themes
- ${TRANSMISSION_ROOT_PATH}/config:/config - ${TRANSMISSION_ROOT_PATH}/config:/config
- ${TRANSMISSION_ROOT_PATH}/downloads:/downloads - ${TRANSMISSION_ROOT_PATH}/downloads:/downloads
- ${TRANSMISSION_ROOT_PATH}/watch:/watch - ${TRANSMISSION_ROOT_PATH}/watch:/watch