From 9664de0e16c42c73070cccf16467f51a7e6414ac Mon Sep 17 00:00:00 2001 From: Mostapha El Sabah Date: Fri, 20 Dec 2024 16:47:28 -0500 Subject: [PATCH] chore: improve local setup and change database type --- .env | 2 +- .gitignore | 5 ++++- devops/docker-compose.dev.yml | 9 +++++++++ devops/docker-compose.wait.yml | 3 +++ package.json | 6 ++++-- prisma/schema.prisma | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 devops/docker-compose.dev.yml create mode 100644 devops/docker-compose.wait.yml diff --git a/.env b/.env index 02ba082..fb1dccd 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ VITE_APP_VERSION=1.0.0-alpha -DATABASE_URL="file:./dev.db" \ No newline at end of file +DATABASE_URL="postgres://hestia:test123@localhost:5432/hestia" \ No newline at end of file diff --git a/.gitignore b/.gitignore index cbf6a49..8c331d8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,7 @@ vite.config.js.timestamp-* vite.config.ts.timestamp-* */dev.db -*/dev.db-journal \ No newline at end of file +*/dev.db-journal + +# Env files +.env.* \ No newline at end of file diff --git a/devops/docker-compose.dev.yml b/devops/docker-compose.dev.yml new file mode 100644 index 0000000..21e83c7 --- /dev/null +++ b/devops/docker-compose.dev.yml @@ -0,0 +1,9 @@ +services: + hestia-database: + image: 'postgres:12-alpine' + container_name: 'hestia-database' + ports: + - '5432:5432' + environment: + POSTGRES_USER: hestia + POSTGRES_PASSWORD: test123 \ No newline at end of file diff --git a/devops/docker-compose.wait.yml b/devops/docker-compose.wait.yml new file mode 100644 index 0000000..0c041e4 --- /dev/null +++ b/devops/docker-compose.wait.yml @@ -0,0 +1,3 @@ +services: + wait: + image: dokku/wait \ No newline at end of file diff --git a/package.json b/package.json index 6f5af34..e026e0e 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,11 @@ "version": "0.0.1", "type": "module", "scripts": { - "dev": "vite dev", + "dev": "bun database:up && bun prisma:push && vite dev", "build": "vite build", + "build-storybook": "storybook build", + "database:up": "docker compose -p hestia -f devops/docker-compose.dev.yml up -d && docker compose -p hestia -f devops/docker-compose.dev.yml -f devops/docker-compose.wait.yml run --rm wait -c hestia-database:5432", + "database:down": "docker compose -p hestia -f devops/docker-compose.dev.yml down", "preview": "vite preview", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", @@ -13,7 +16,6 @@ "test:unit": "vitest", "test": "bun run test:unit -- --run && bun run test:e2e", "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build", "test:e2e": "playwright test", "prisma:dev": "prisma migrate dev", "prisma:format": "prisma format", diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 4449dae..a23c87a 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -10,7 +10,7 @@ generator pothos { } datasource db { - provider = "sqlite" + provider = "postgresql" url = env("DATABASE_URL") }