Merge remote-tracking branch 'origin/main' into codex/catalog-studio-ux

.gitea/workflows/ci.yaml

@@ -140,8 +140,6 @@ jobs:
             -v /var/www/Gamedata:/var/www/Gamedata \
             epicnext-cms:latest
 
-          docker image prune -f
-
       - name: Health check
         run: |
           for i in $(seq 1 30); do
@@ -162,6 +160,19 @@ jobs:
           docker compose -f /var/www/atom-nexst/docker-compose.yml up -d --no-build 2>&1 || true
           exit 1
 
+      - name: Prune Docker cache
+        if: always()
+        run: |
+          # Ruim de self-hosted runner op zodat de Docker daemon niet
+          # volloopt. Draaiende containers/images (o.a. de net-deployed
+          # epicnext-cms-app) worden nooit geraakt, alleen ongebruikte
+          # images, build-cache, volumes en networks verdwijnen.
+          docker image prune -af || true
+          docker container prune -f || true
+          docker volume prune -f || true
+          docker network prune -f || true
+          docker builder prune -af --keep-storage=2g || true
+
   # ─────────────────────────────────────────────
   # E2E smoke against the freshly deployed container.
   # Runs after a successful deploy on main/master only

src/app/admin/import/furni/upload/upload-furni-client.tsx

@@ -3,6 +3,7 @@
 import { AlertCircle, Check, Loader2, Upload } from "lucide-react";
 import { useRef, useState } from "react";
 import { toast } from "sonner";
+import { ImportErrorBanner } from "@/components/admin/import-error-banner";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
@@ -303,12 +304,7 @@ export function UploadFurniClient() {
 						</div>
 					</div>
 
-					{error && (
+					{error && <ImportErrorBanner error={error} />}
-						<div className="rounded-lg border px-4 py-3 text-sm bg-destructive/10 border-destructive/20 text-destructive flex items-center gap-2">
-							<AlertCircle className="w-4 h-4 shrink-0" />
-							{error}
-						</div>
-					)}
 
 					<div className="flex gap-3">
 						<Button type="submit" disabled={uploading}>

src/lib/deploy-workflow-contract.test.ts

@@ -79,8 +79,13 @@ describe("deploy job", () => {
 		expect(deployJob).toContain('"database":true');
 	});
 
-	it("cleans up old images", () => {
+	it("prunes old images, containers, volumes, networks and build cache", () => {
-		expect(deployJob).toContain("docker image prune -f");
+		expect(deployJob).toContain("docker image prune -af");
+		expect(deployJob).toContain("docker container prune -f");
+		expect(deployJob).toContain("docker volume prune -f");
+		expect(deployJob).toContain("docker network prune -f");
+		expect(deployJob).toContain("docker builder prune");
+		expect(deployJob).toContain("Prune Docker cache");
 	});
 
 	it("does not run pnpm test in deploy", () => {