From b70c7f39e618dc1ea72d2204ca15f33e83ecb8ab Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Thu, 13 Nov 2025 19:57:07 +0100
Subject: [PATCH] fix: drizzle paths

---
 .dockerignore                              | 1 -
 Dockerfile                                 | 8 ++++----
 app/client/modules/volumes/tabs/docker.tsx | 2 +-
 app/client/modules/volumes/tabs/info.tsx   | 2 +-
 app/server/db/db.ts                        | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 7015b036..9980d983 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -13,7 +13,6 @@
 !**/components.json
 
 !src/**
-!drizzle/**
 !app/**
 !public/**
 
diff --git a/Dockerfile b/Dockerfile
index 5c3126fc..32b23e4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -78,14 +78,14 @@ ENV NODE_ENV="production"
 
 WORKDIR /app
 
+COPY --from=builder /app/package.json ./
+RUN bun install --production --frozen-lockfile
+
 COPY --from=deps /deps/restic /usr/local/bin/restic
 COPY --from=deps /deps/rclone /usr/local/bin/rclone
 COPY --from=builder /app/dist/client ./dist/client
 COPY --from=builder /app/dist/server ./dist/server
-COPY --from=builder /app/drizzle ./assets/migrations
-COPY --from=builder /app/package.json ./
-
-RUN bun install --production --frozen-lockfile
+COPY --from=builder /app/app/drizzle ./assets/migrations
 
 # Include third-party licenses and attribution
 COPY ./LICENSES ./LICENSES
diff --git a/app/client/modules/volumes/tabs/docker.tsx b/app/client/modules/volumes/tabs/docker.tsx
index 03403153..b9424798 100644
--- a/app/client/modules/volumes/tabs/docker.tsx
+++ b/app/client/modules/volumes/tabs/docker.tsx
@@ -52,7 +52,7 @@ export const DockerTabContent = ({ volume }: Props) => {
 	};
 
 	return (
-		<div className="grid gap-4 xl:grid-cols-[minmax(0,_1fr)_minmax(0,_1fr)]">
+		<div className="grid gap-4 xl:grid-cols-[minmax(0,1fr)_minmax(0,1fr)]">
 			<Card>
 				<CardHeader>
 					<CardTitle>Plug-and-play Docker integration</CardTitle>
diff --git a/app/client/modules/volumes/tabs/info.tsx b/app/client/modules/volumes/tabs/info.tsx
index 9bb65d41..5b8a451b 100644
--- a/app/client/modules/volumes/tabs/info.tsx
+++ b/app/client/modules/volumes/tabs/info.tsx
@@ -57,7 +57,7 @@ export const VolumeInfoTabContent = ({ volume, statfs }: Props) => {
 
 	return (
 		<>
-			<div className="grid gap-4 xl:grid-cols-[minmax(0,_2.3fr)_minmax(320px,_1fr)]">
+			<div className="grid gap-4 xl:grid-cols-[minmax(0,2.3fr)_minmax(320px,1fr)]">
 				<Card className="p-6">
 					<CreateVolumeForm
 						initialValues={{ ...volume, ...volume.config }}
diff --git a/app/server/db/db.ts b/app/server/db/db.ts
index 28e78da3..0ddc52b3 100644
--- a/app/server/db/db.ts
+++ b/app/server/db/db.ts
@@ -19,7 +19,7 @@ export const runDbMigrations = () => {
 
 	const { NODE_ENV } = process.env;
 	if (NODE_ENV !== "production") {
-		migrationsFolder = path.join("/app", "drizzle");
+		migrationsFolder = path.join("/app", "app", "drizzle");
 	}
 
 	migrate(db, { migrationsFolder });