Merge pull request 'build: repin UPSTREAM_REF to fixed PostgreSQL upgrade path' (#10) from benvin/jellyfin-v0.3.1 into main

Reviewed-on: #10

.woodpecker/build.yaml

@@ -5,7 +5,7 @@ steps:
   # Clone the pinned upstream jellyfin-ha source and publish the .NET server
   # into ./publish-output (consumed by Dockerfile.runtime).
   - name: publish
-    image: mcr.microsoft.com/dotnet/sdk:9.0
+    image: mcr.microsoft.com/dotnet/sdk:10.0
     commands:
       - |
         REF=$$(cat UPSTREAM_REF)
@@ -26,7 +26,7 @@ steps:
 
   # Validate the runtime image builds (no push on PRs).
   - name: docker-build
-    image: woodpeckerci/plugin-docker-buildx
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest
     settings:
       repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha
       dockerfile: Dockerfile.runtime

.woodpecker/docker.yaml

@@ -5,7 +5,7 @@ when:
 steps:
   # Same publish step as the PR pipeline: clone pinned upstream + dotnet publish.
   - name: publish
-    image: mcr.microsoft.com/dotnet/sdk:9.0
+    image: mcr.microsoft.com/dotnet/sdk:10.0
     commands:
       - |
         REF=$$(cat UPSTREAM_REF)

Dockerfile.runtime

@@ -18,14 +18,47 @@ RUN apt-get update \
  && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/debian bookworm main" \
     > /etc/apt/sources.list.d/jellyfin.list \
  && apt-get update \
- && apt-get install -y --no-install-recommends "jellyfin-web=10.11.6+deb12" \
+ && apt-get install -y --no-install-recommends "jellyfin-web=12.0+deb12" \
  && rm -rf /var/lib/apt/lists/*
 
+# ── Plugin stage ──────────────────────────────────────────────────────────────
+# Download and verify the auth plugins, unpacked into versioned dirs baked into
+# the image and synced into /config/plugins at start (docker-entrypoint.sh).
+# Versions are the newest each plugin publishes whose targetAbi <= the pinned
+# Jellyfin server version (12.0.0):
+#   LDAP Authentication 24.0.0.0  targetAbi 12.0.0.0
+#   SSO Authentication  4.0.0.4   targetAbi 10.11.0.0 (newest release; loads on 12.0)
+# sha256 pins make each fetch reproducible.
+FROM --platform=linux/amd64 debian:bookworm-slim AS plugins
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends curl ca-certificates unzip \
+ && rm -rf /var/lib/apt/lists/*
+
+ARG LDAP_URL=http://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/jellyfin/files/plugin/ldap-authentication/ldap-authentication_24.0.0.0.zip
+ARG LDAP_SHA256=3be1f9d6a6ce9ea375e556dd30136d178a8dbe35cbe866d30d3451dc3ff7e804
+# LDAP is served through artifactapi remote. SSO is served through the artifactapi
+# github proxy, which the CI build network can reach (github is not directly reachable).
+ARG SSO_URL=http://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/9p4/jellyfin-plugin-sso/releases/download/v4.0.0.4/sso-authentication_4.0.0.4.zip
+ARG SSO_SHA256=c09f16ba31059a434ddd7f811e4f9608d4b4c4514cc80a5bf1ca33bee61e1107
+
+WORKDIR /plugins
+RUN set -eu; \
+    curl -fsSL "$LDAP_URL" -o ldap.zip; \
+    echo "$LDAP_SHA256  ldap.zip" | sha256sum -c -; \
+    mkdir -p "LDAP Authentication_24.0.0.0"; \
+    unzip -oq ldap.zip -d "LDAP Authentication_24.0.0.0"; \
+    curl -fsSL "$SSO_URL" -o sso.zip; \
+    echo "$SSO_SHA256  sso.zip" | sha256sum -c -; \
+    mkdir -p "SSO Authentication_4.0.0.4"; \
+    unzip -oq sso.zip -d "SSO Authentication_4.0.0.4"; \
+    rm -f ldap.zip sso.zip
+
 # ── Runtime stage ─────────────────────────────────────────────────────────────
-# .NET 9 runtime: matches the SDK 9.0 publish step (framework-dependent), so the
-# app's required Microsoft.NETCore.App 9.0 is present. Keep in lockstep with the
-# `mcr.microsoft.com/dotnet/sdk` major in .woodpecker/*.yaml and the Makefile.
-FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:9.0
+# .NET 10 runtime: matches the SDK 10.0 publish step (framework-dependent) and the
+# fork's net10.0 TFM, so the app's required Microsoft.NETCore.App 10.0 is present.
+# Keep in lockstep with the `mcr.microsoft.com/dotnet/sdk` major in .woodpecker/*.yaml.
+FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:10.0
 
 # FFmpeg and the native deps required by SkiaSharp and fontconfig.
 RUN apt-get update \
@@ -42,6 +75,9 @@ WORKDIR /jellyfin
 COPY publish-output/ .
 # jellyfin-web client assets from the webclient stage.
 COPY --from=webclient /usr/share/jellyfin/web ./jellyfin-web/
+# Baked auth plugins; docker-entrypoint.sh syncs these into /config/plugins.
+COPY --from=plugins /plugins /usr/share/jellyfin/plugins-baked
+COPY --chmod=0755 docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 
 # Jellyfin default ports
 EXPOSE 8096
@@ -54,7 +90,4 @@ ENV JELLYFIN_DATA_DIR=/config \
     JELLYFIN_CACHE_DIR=/cache \
     JELLYFIN_LOG_DIR=/config/log
 
-ENTRYPOINT ["./jellyfin", \
-            "--datadir", "/config", \
-            "--cachedir", "/cache", \
-            "--webdir", "/jellyfin/jellyfin-web"]
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

README.md

@@ -4,12 +4,12 @@ Build-orchestration repo for [ZoltyMat/jellyfin-ha](https://github.com/ZoltyMat/
 that adds distributed, Redis-backed transcoding for multi-pod Kubernetes (lease-aware cleanup, HA session
 takeover, optional PostgreSQL).
 
-This repo does **not** vendor the fork's source. It pins an upstream commit, builds the .NET 9 server, and
+This repo does **not** vendor the fork's source. It pins an upstream commit, builds the .NET 10 server, and
 produces a runtime container image pushed to the Gitea registry.
 
 ## What it produces
 
-`artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:<tag>` — an `mcr.microsoft.com/dotnet/aspnet:9.0` based image with ffmpeg and
+`artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:<tag>` — an `mcr.microsoft.com/dotnet/aspnet:10.0` based image with ffmpeg and
 the prebuilt `jellyfin-web` client, running the published `jellyfin-ha` server.
 
 ## Layout
@@ -34,7 +34,7 @@ the prebuilt `jellyfin-web` client, running the published `jellyfin-ha` server.
 make build            # clones pinned upstream, dotnet publish, docker build
 ```
 
-Requires the .NET 9 SDK and Docker. `make publish` runs just the clone + publish into `./publish-output`.
+Requires the .NET 10 SDK and Docker. `make publish` runs just the clone + publish into `./publish-output`.
 
 ## Deployment
 

UPSTREAM_REF

@@ -1 +1 @@
-2e1e445e470c2f2c1520f66678a73faa226c2058
+10fed9409db4d65a101bdcbadaf86c8f2180a901

docker-entrypoint.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+# Sync image-baked plugins into the /config (datadir) plugins directory on every
+# start. /config is a PVC that overlays the image, so plugins baked into the
+# image are invisible until copied in here. Removing any existing versioned dir
+# of the same plugin first lets the image version win across restarts/downgrades.
+set -eu
+
+BAKED_DIR=/usr/share/jellyfin/plugins-baked
+PLUGIN_DIR=/config/plugins
+
+if [ -d "$BAKED_DIR" ]; then
+  mkdir -p "$PLUGIN_DIR"
+  for src in "$BAKED_DIR"/*; do
+    [ -d "$src" ] || continue
+    name=$(basename "$src")   # e.g. "LDAP Authentication_22.0.0.0"
+    base=${name%_*}           # plugin name without the trailing _<version>
+    for existing in "$PLUGIN_DIR/$base"_*; do
+      [ -e "$existing" ] && rm -rf "$existing"
+    done
+    rm -rf "$PLUGIN_DIR/$name"
+    cp -a "$src" "$PLUGIN_DIR/$name"
+  done
+fi
+
+exec ./jellyfin \
+  --datadir /config \
+  --cachedir /cache \
+  --webdir /jellyfin/jellyfin-web \
+  "$@"