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

Reviewed-on: #7

.woodpecker/docker.yaml

@@ -24,44 +24,25 @@ steps:
             memory: 6Gi
             cpu: 4
 
-  # Stage the internal (Vault) CA into the shared workspace so the buildkit push
-  # below can verify artifactapi's TLS cert. almalinux9-base already trusts the
-  # unkin CA (it is the image the RPM release pipelines use to reach artifactapi
-  # over HTTPS), so its consolidated trust bundle contains the chain we need.
-  - name: ca-trust
-    image: git.unkin.net/unkin/almalinux9-base:20260606
-    commands:
-      - cp /etc/pki/tls/certs/ca-bundle.crt "$${CI_WORKSPACE}/artifactapi-ca.crt"
-    depends_on: [publish]
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 256Mi
-            cpu: 250m
-          limits:
-            memory: 512Mi
-            cpu: 1
-
   # Build the runtime image and push it to the artifactapi local docker registry.
-  # buildkit_config points buildkit at the staged CA so the TLS handshake with
-  # artifactapi (Vault-signed cert) verifies; buildx copies the referenced CA
-  # into the buildkitd container under /etc/buildkit/certs when it creates the
-  # builder. CI_WORKSPACE is runtime-only so the path is the fixed workspace path.
+  # 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: artifactapi.k8s.syd1.au.unkin.net
       repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha
       dockerfile: Dockerfile.runtime
       buildkit_config: |
         [registry."artifactapi.k8s.syd1.au.unkin.net"]
-          ca = ["/woodpecker/src/git.unkin.net/unkin/jellyfin-ha/artifactapi-ca.crt"]
+          ca = ["/etc/docker/certs.d/artifactapi.k8s.syd1.au.unkin.net/ca.crt"]
       tags:
         - ${CI_COMMIT_TAG}
         - latest
-    depends_on: [ca-trust]
+    depends_on: [publish]
     backend_options:
       kubernetes:
         serviceAccountName: default

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 \

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
 
-`artifactapi.k8s.syd1.au.unkin.net/docker-internal/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
@@ -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