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

This commit is contained in:
Simo committed 2026-09-05 20:16:51 +02:00
commit 180129699c
3 files changed
+22 -10

No files matched your search

@@ -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 && (
<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>
)}
{error && <ImportErrorBanner error={error} />}
<div className="flex gap-3">
<Button type="submit" disabled={uploading}>
+7 -2
View File
@@ -79,8 +79,13 @@ describe("deploy job", () => {
expect(deployJob).toContain('"database":true');
});
it("cleans up old images", () => {
expect(deployJob).toContain("docker image prune -f");
it("prunes old images, containers, volumes, networks and build cache", () => {
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", () => {