From 2c57f9a082445057cb1437600926ef7e06888213 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 28 Jun 2025 14:45:41 +0800 Subject: [PATCH 1/6] Update to version 1.21.6 --- minecraft/compose.yaml | 2 +- minecraft/server.env | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft/compose.yaml b/minecraft/compose.yaml index 0cc2cd1..6088cb9 100644 --- a/minecraft/compose.yaml +++ b/minecraft/compose.yaml @@ -12,7 +12,7 @@ services: - 25565:25565 environment: - TYPE=VELOCITY - - MINECRAFT_VERSION=1.21.5 + - MINECRAFT_VERSION=1.21.6 minecraft_server_mc: image: itzg/minecraft-server diff --git a/minecraft/server.env b/minecraft/server.env index 5394f7b..58241ec 100644 --- a/minecraft/server.env +++ b/minecraft/server.env @@ -2,8 +2,8 @@ EULA=TRUE TZ=Australia/Perth TYPE=PAPER RCON_PASSWORD=${RCON_PASSWORD} -PAPER_CHANNEL=experimental -VERSION=1.21.5 +# PAPER_CHANNEL=experimental +VERSION=1.21.6 ENABLE_ROLLING_LOGS=true LOG_TIMESTAMP=true OVERRIDE_ICON=TRUE From 952aa0a5fee094d6ea2c4e92ab58f31bc344696f Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 28 Jun 2025 14:50:30 +0800 Subject: [PATCH 2/6] Revert version upgrade, but keep using stable paper release. --- minecraft/compose.yaml | 2 +- minecraft/server.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft/compose.yaml b/minecraft/compose.yaml index 6088cb9..0cc2cd1 100644 --- a/minecraft/compose.yaml +++ b/minecraft/compose.yaml @@ -12,7 +12,7 @@ services: - 25565:25565 environment: - TYPE=VELOCITY - - MINECRAFT_VERSION=1.21.6 + - MINECRAFT_VERSION=1.21.5 minecraft_server_mc: image: itzg/minecraft-server diff --git a/minecraft/server.env b/minecraft/server.env index 58241ec..d036f2e 100644 --- a/minecraft/server.env +++ b/minecraft/server.env @@ -3,7 +3,7 @@ TZ=Australia/Perth TYPE=PAPER RCON_PASSWORD=${RCON_PASSWORD} # PAPER_CHANNEL=experimental -VERSION=1.21.6 +VERSION=1.21.5 ENABLE_ROLLING_LOGS=true LOG_TIMESTAMP=true OVERRIDE_ICON=TRUE From 5fb67449a207f02b98d90deba5770287cfcfca50 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 28 Jun 2025 15:40:20 +0800 Subject: [PATCH 3/6] Turns out experimental channel was required. --- minecraft/server.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/server.env b/minecraft/server.env index d036f2e..5394f7b 100644 --- a/minecraft/server.env +++ b/minecraft/server.env @@ -2,7 +2,7 @@ EULA=TRUE TZ=Australia/Perth TYPE=PAPER RCON_PASSWORD=${RCON_PASSWORD} -# PAPER_CHANNEL=experimental +PAPER_CHANNEL=experimental VERSION=1.21.5 ENABLE_ROLLING_LOGS=true LOG_TIMESTAMP=true From bcc0b8c6b3617adfd4fc2d104676d57e43ee1e1c Mon Sep 17 00:00:00 2001 From: komodo Date: Sat, 28 Jun 2025 15:44:48 +0800 Subject: [PATCH 4/6] [Komodo] fern: Write Compose File: update jellyfin/compose.yaml --- jellyfin/compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jellyfin/compose.yaml b/jellyfin/compose.yaml index fed1ded..7998308 100644 --- a/jellyfin/compose.yaml +++ b/jellyfin/compose.yaml @@ -65,6 +65,8 @@ services: POSTGRES_IP: jellystat_db POSTGRES_PORT: 5432 JWT_SECRET: ${JELLYSTAT_JWT_SECRET} + JS_USER: fern + JS_PASSWORD: ${JELLYSTAT_PASSWORD} TZ: Australia/Perth volumes: - jellystat_data:/app/backend/backup-data From ee3bf0ca79bc8834beb5f66187bacb9cec62383a Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sat, 28 Jun 2025 16:09:29 +0800 Subject: [PATCH 5/6] Add scrutiny --- scrutiny/compose.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 scrutiny/compose.yaml diff --git a/scrutiny/compose.yaml b/scrutiny/compose.yaml new file mode 100644 index 0000000..f153e6e --- /dev/null +++ b/scrutiny/compose.yaml @@ -0,0 +1,24 @@ +services: + scrutiny: + image: ghcr.io/analogj/scrutiny:master-omnibus + container_name: scrutiny + cap_add: SYS_RAWIO + volumes: + - /run/udev:/run/udev:ro + - /mnt/docker/scrutiny/influxdb:/opt/scrutiny/influxdb + - /mnt/docker/scrutiny/config:/opt/scrutiny/config + devices: + - /dev/disk/by-uuid/fcee0188-8ca1-4fda-81b7-f5920c79ab48 + - /dev/disk/by-uuid/5d9dd538-79e4-4168-be91-e0b040155cb3 + - /dev/disk/by-uuid/5a43b7dc-3e28-459e-824a-ad45b5475361 + labels: + caddy: scrutiny.ferngarden.net + caddy.import: internal + caddy.reverse_proxy: '{{ upstreams 8080 }}' + +networks: + default: + proxy: + external: true + metrics: + external: true \ No newline at end of file From 9ce1d02f5c994a7f24a721d48c6bbbbeb17b7f02 Mon Sep 17 00:00:00 2001 From: komodo Date: Sat, 28 Jun 2025 16:10:22 +0800 Subject: [PATCH 6/6] [Komodo] fern: Write Compose File: update scrutiny/compose.yaml --- scrutiny/compose.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scrutiny/compose.yaml b/scrutiny/compose.yaml index f153e6e..5ab5180 100644 --- a/scrutiny/compose.yaml +++ b/scrutiny/compose.yaml @@ -2,7 +2,8 @@ services: scrutiny: image: ghcr.io/analogj/scrutiny:master-omnibus container_name: scrutiny - cap_add: SYS_RAWIO + cap_add: + - SYS_RAWIO volumes: - /run/udev:/run/udev:ro - /mnt/docker/scrutiny/influxdb:/opt/scrutiny/influxdb