Merge pull request 'fix: align runtime image .NET to the app (9.0)' (#7) from benvin/jellyfin-dotnet9 into main

Reviewed-on: #7

.woodpecker/build.yaml

@@ -5,11 +5,11 @@ 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:10.0
+    image: mcr.microsoft.com/dotnet/sdk:9.0
     commands:
       - |
         REF=$$(cat UPSTREAM_REF)
-        git clone https://github.com/ZoltyMat/jellyfin-ha.git src
+        git clone https://git.unkin.net/unkin/jellyfin-ha-src.git src
         git -C src checkout "$$REF"
         dotnet publish src/Jellyfin.Server/Jellyfin.Server.csproj \
           -c Release -r linux-x64 --self-contained false -o ./publish-output
@@ -28,7 +28,7 @@ steps:
   - name: docker-build
     image: woodpeckerci/plugin-docker-buildx
     settings:
-      repo: git.unkin.net/unkin/jellyfin-ha
+      repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha
       dockerfile: Dockerfile.runtime
       dry_run: true
     depends_on: [publish]

.woodpecker/docker.yaml

@@ -5,11 +5,11 @@ when:
 steps:
   # Same publish step as the PR pipeline: clone pinned upstream + dotnet publish.
   - name: publish
-    image: mcr.microsoft.com/dotnet/sdk:10.0
+    image: mcr.microsoft.com/dotnet/sdk:9.0
     commands:
       - |
         REF=$$(cat UPSTREAM_REF)
-        git clone https://github.com/ZoltyMat/jellyfin-ha.git src
+        git clone https://git.unkin.net/unkin/jellyfin-ha-src.git src
         git -C src checkout "$$REF"
         dotnet publish src/Jellyfin.Server/Jellyfin.Server.csproj \
           -c Release -r linux-x64 --self-contained false -o ./publish-output
@@ -24,16 +24,21 @@ steps:
             memory: 6Gi
             cpu: 4
 
-  # Build the runtime image and push it to the Gitea registry.
+  # Build the runtime image and push it to the artifactapi local docker registry.
+  # The plugin image bakes artifactapi's internal (Vault) CA at
+  # /etc/docker/certs.d/<registry>/ca.crt; buildkit_config points the buildx
+  # docker-container builder at that in-image CA. buildkitd runs in its own
+  # container and performs the push, so it needs the CA via --config even though
+  # the plugin image already trusts it — buildx copies the referenced file in.
   - name: docker
-    image: woodpeckerci/plugin-docker-buildx
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest
     settings:
-      registry: git.unkin.net
-      repo: git.unkin.net/unkin/jellyfin-ha
+      registry: artifactapi.k8s.syd1.au.unkin.net
+      repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha
       dockerfile: Dockerfile.runtime
-      username: droneci
-      password:
-        from_secret: DRONECI_PASSWORD
+      buildkit_config: |
+        [registry."artifactapi.k8s.syd1.au.unkin.net"]
+          ca = ["/etc/docker/certs.d/artifactapi.k8s.syd1.au.unkin.net/ca.crt"]
       tags:
         - ${CI_COMMIT_TAG}
         - latest

Dockerfile.runtime

@@ -22,7 +22,10 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 # ── Runtime stage ─────────────────────────────────────────────────────────────
-FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:10.0
+# .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
 
 # FFmpeg and the native deps required by SkiaSharp and fontconfig.
 RUN apt-get update \

Makefile

@@ -1,6 +1,6 @@
 .PHONY: publish build clean patch minor major
 
-IMAGE   ?= git.unkin.net/unkin/jellyfin-ha
+IMAGE   ?= artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha
 VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "0.0.0-dev")
 REF     := $(shell cat UPSTREAM_REF)
 
@@ -8,7 +8,7 @@ REF     := $(shell cat UPSTREAM_REF)
 # ./publish-output (consumed by Dockerfile.runtime). Mirrors CI.
 publish:
 	rm -rf src publish-output
-	git clone https://github.com/ZoltyMat/jellyfin-ha.git src
+	git clone https://git.unkin.net/unkin/jellyfin-ha-src.git src
 	git -C src checkout $(REF)
 	dotnet publish src/Jellyfin.Server/Jellyfin.Server.csproj \
 		-c Release -r linux-x64 --self-contained false -o ./publish-output

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 10 server, and
+This repo does **not** vendor the fork's source. It pins an upstream commit, builds the .NET 9 server, and
 produces a runtime container image pushed to the Gitea registry.
 
 ## What it produces
 
-`git.unkin.net/unkin/jellyfin-ha:<tag>` — an `mcr.microsoft.com/dotnet/aspnet:10.0` based image with ffmpeg and
+`artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:<tag>` — an `mcr.microsoft.com/dotnet/aspnet:9.0` based image with ffmpeg and
 the prebuilt `jellyfin-web` client, running the published `jellyfin-ha` server.
 
 ## Layout
@@ -26,7 +26,7 @@ the prebuilt `jellyfin-web` client, running the published `jellyfin-ha` server.
 
 1. To track a newer upstream, update `UPSTREAM_REF` to the desired commit SHA and merge via PR.
 2. Cut a release: `make patch` (or `minor` / `major`) tags `vX.Y.Z` and pushes it, which triggers
-   `.woodpecker/docker.yaml` to build and push `git.unkin.net/unkin/jellyfin-ha:vX.Y.Z` + `:latest`.
+   `.woodpecker/docker.yaml` to build and push `artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:vX.Y.Z` + `:latest`.
 
 ## Local build
 
@@ -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 10 SDK and Docker. `make publish` runs just the clone + publish into `./publish-output`.
+Requires the .NET 9 SDK and Docker. `make publish` runs just the clone + publish into `./publish-output`.
 
 ## Deployment
 

UPSTREAM_REF

@@ -1 +1 @@
-d4f9c12c22d3a640f3b0a3622b23b8cd01d044ad
+2e1e445e470c2f2c1520f66678a73faa226c2058