From 53b9cccd51dde50ffbb4eb730b92eec55cfe5e62 Mon Sep 17 00:00:00 2001 From: "SilverAg.L" Date: Thu, 6 Nov 2025 01:58:02 +0800 Subject: [PATCH] update --- aria2/docker-compose.yml | 5 +---- bililive.observer/Dockerfile | 4 ++-- bililive.observer/deploy.sh | 8 +++----- jellyfin/docker-compose.yml | 9 +++------ mihomo/docker-compose.yml | 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/aria2/docker-compose.yml b/aria2/docker-compose.yml index 3718393..83a5e7e 100644 --- a/aria2/docker-compose.yml +++ b/aria2/docker-compose.yml @@ -5,15 +5,12 @@ services: aria2: image: p3terx/aria2-pro container_name: aria2 - # haven't test. I just keep using individual containers. logging: driver: json-file options: max-size: 1m volumes: - - $HOME/.config/aria2:/config - # Don't really understand differences between attaching with bind-mounting =.= - # - $HOME/_downloads:/downloads + - /opt/aria2:/config - type: bind source: $HOME/_downloads target: /downloads diff --git a/bililive.observer/Dockerfile b/bililive.observer/Dockerfile index 6a2f92b..4933bfc 100644 --- a/bililive.observer/Dockerfile +++ b/bililive.observer/Dockerfile @@ -1,7 +1,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS prepare ARG REPO=github.com/frg2089/BiliLive.Observer TARGET_VER=0.0.9 -ADD https://$REPO/releases/download/v$TARGET_VER/BiliLive.Observer.zip /mnt/ -# ADD https://$REPO/releases/latest/download/BiliLive.Observer.zip /mnt/ +# ADD https://$REPO/releases/download/v$TARGET_VER/BiliLive.Observer.zip /mnt/ +ADD https://$REPO/releases/latest/download/BiliLive.Observer.zip /mnt/ RUN apt update && apt install -y unzip && unzip -o /mnt/BiliLive.Observer.zip -d /package FROM mcr.microsoft.com/dotnet/aspnet:9.0 diff --git a/bililive.observer/deploy.sh b/bililive.observer/deploy.sh index b19caa9..4ce7e12 100755 --- a/bililive.observer/deploy.sh +++ b/bililive.observer/deploy.sh @@ -1,12 +1,10 @@ #!/bin/bash # may be able to `sudo` the whole script? -docker build -t frg2089/bililive:0.0.9 . -docker run -d --name obs-bililive -p 15000:5000 frg2089/bililive:0.0.9 +docker build -t frg2089/bililive:latest . +docker run -d --name obs-bililive -p 15000:5000 frg2089/bililive:latest -[[ -n $(docker ps | grep 'obs-bililive') ]] && ( - docker logs obs-bililive -) || { +[[ -n $(docker ps | grep 'obs-bililive') ]] && docker logs obs-bililive || { echo "[ERROR] Failed to start bililive observer service." exit 1 } diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml index 241219e..5e20c39 100644 --- a/jellyfin/docker-compose.yml +++ b/jellyfin/docker-compose.yml @@ -4,14 +4,12 @@ services: container_name: jellyfin network_mode: 'host' volumes: - # manual replace - - $HOME/.config/jellyfin:/config + - /opt/jellyfin:/config - jellyfin-cache:/cache - type: bind source: /media target: /media # Optional - extra fonts to be used during transcoding with subtitle burn-in - # just use Noto fonts. - type: bind source: /usr/share/fonts/opentype target: /usr/local/share/fonts/custom @@ -20,9 +18,8 @@ services: - /dev/dri:/dev/dri restart: 'unless-stopped' # Optional - alternative address used for autodiscovery - # hidden. - environment: - - JELLYFIN_PublishedServerUrl=https://blablabla.local + # environment: + # - JELLYFIN_PublishedServerUrl= # Optional - may be necessary for docker healthcheck to pass if running in host network mode extra_hosts: - 'host.docker.internal:host-gateway' diff --git a/mihomo/docker-compose.yml b/mihomo/docker-compose.yml index e6f257d..261a9bf 100644 --- a/mihomo/docker-compose.yml +++ b/mihomo/docker-compose.yml @@ -13,7 +13,7 @@ services: cap_add: - ALL volumes: - - /usr/local/etc/mihomo:/root/.config/mihomo + - /opt/mihomo:/root/.config/mihomo - /dev/net/tun:/dev/net/tun yacd: image: p3terx/yacd