From 96f5157adf937d0833419b15cfacefb41a13ac78 Mon Sep 17 00:00:00 2001
From: Mihkel Martin Kasterpalu <qpeuitovxg@use.startmail.com>
Date: Wed, 12 Feb 2025 06:56:18 +0200
Subject: [PATCH] Fix deploy?
---
Dockerfile | 6 ++++--
drizzle.config.ts | 12 ++++--------
package.json | 1 +
src/lib/server/db/index.ts | 6 +++---
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 3570b88..494a81d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,9 @@ RUN pnpm i
COPY . .
-RUN pnpm run db:push \
- && pnpm build
+RUN pnpm drizzle-kit generate \
+ && pnpm drizzle-kit push \
+ && pnpm build
FROM node:20
@@ -23,6 +24,7 @@ WORKDIR /app
COPY --from=build /app/build /app/build
COPY --from=build /app/package.json /app/package.json
COPY --from=build /app/local.db /app/local.db
+COPY --from=build /app/drizzle /app/drizzle
RUN npm install --omit=dev --legacy-peer-deps
diff --git a/drizzle.config.ts b/drizzle.config.ts
index e28ca0c..1d30140 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -1,14 +1,10 @@
import { defineConfig } from 'drizzle-kit';
-if (!process.env.DATABASE_URL) throw new Error('DATABASE_URL is not set');
export default defineConfig({
schema: './src/lib/server/db/schema.ts',
-
+ out: './drizzle',
+ dialect: 'sqlite',
dbCredentials: {
- url: process.env.DATABASE_URL
- },
-
- verbose: true,
- strict: true,
- dialect: 'sqlite'
+ url: 'local.db'
+ }
});
diff --git a/package.json b/package.json
index 35dd41b..58f9e8f 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"lint": "prettier --check . && eslint .",
"db:push": "drizzle-kit push",
"db:migrate": "drizzle-kit migrate",
+ "db:generate": "drizzle-kit generate",
"db:studio": "drizzle-kit studio"
},
"devDependencies": {
diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index 205b05b..1b00454 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -1,6 +1,6 @@
import { drizzle } from 'drizzle-orm/better-sqlite3';
import Database from 'better-sqlite3';
-import { env } from '$env/dynamic/private';
-if (!env.DATABASE_URL) throw new Error('DATABASE_URL is not set');
-const client = new Database(env.DATABASE_URL);
+
+const client = new Database('local.db');
+
export const db = drizzle(client);