From 706b804b3f25995a1f1d98dd967872eb480abfde Mon Sep 17 00:00:00 2001 From: Advayp <69655599+Advayp@users.noreply.github.com> Date: Sat, 18 Jan 2025 15:54:37 -0800 Subject: [PATCH] Adjust Prisma settings to work with Docker (#43) * Adjust prisma settings to work with docker * Add previously missing package * Remove error catching left over from debugging * Update route.ts --- backend/Dockerfile | 10 +++++----- backend/app/api/user/register/route.ts | 9 +-------- backend/docker-compose.dev.yml | 2 -- backend/package.json | 3 ++- backend/prisma/schema.prisma | 1 + 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 6bd57b5..33b21f6 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.10-alpine AS base +FROM node:23.4-alpine AS base # Install dependencies only when needed FROM base AS deps @@ -9,12 +9,12 @@ WORKDIR /app # Install dependencies COPY package.json package-lock.json* ./ RUN npm install +COPY ./prisma ./prisma +RUN npx prisma generate FROM base AS dev WORKDIR /app COPY --from=deps /app/node_modules ./node_modules -COPY . . - -# Generate prisma migrations -RUN npx prisma generate \ No newline at end of file +COPY --from=deps /app/prisma /app/prisma +COPY . . \ No newline at end of file diff --git a/backend/app/api/user/register/route.ts b/backend/app/api/user/register/route.ts index a16bc94..114ab2c 100644 --- a/backend/app/api/user/register/route.ts +++ b/backend/app/api/user/register/route.ts @@ -1,19 +1,12 @@ import prisma from '@/lib/prisma'; import { createSession } from '@/lib/session'; -import { User } from '@prisma/client'; import { NextRequest, NextResponse } from 'next/server'; type PostRequest = { username: string; }; -type PostResponse = { - user: User; -}; - -export const POST = async ( - req: NextRequest -): Promise> => { +export const POST = async (req: NextRequest) => { const { username }: PostRequest = await req.json(); const user = await prisma.user.create({ diff --git a/backend/docker-compose.dev.yml b/backend/docker-compose.dev.yml index 894983f..bdbcba3 100644 --- a/backend/docker-compose.dev.yml +++ b/backend/docker-compose.dev.yml @@ -26,6 +26,4 @@ services: depends_on: - postgres volumes: - - .:/app - - /app/node_modules - /app/.next diff --git a/backend/package.json b/backend/package.json index cfaf2e7..706babe 100644 --- a/backend/package.json +++ b/backend/package.json @@ -16,7 +16,8 @@ "jose": "^5.9.6", "next": "15.1.4", "react": "^19.0.0", - "react-dom": "^19.0.0" + "react-dom": "^19.0.0", + "prisma": "^6.2.1" }, "devDependencies": { "@eslint/eslintrc": "^3", diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma index 732603c..b1a5dca 100644 --- a/backend/prisma/schema.prisma +++ b/backend/prisma/schema.prisma @@ -5,6 +5,7 @@ datasource db { generator client { provider = "prisma-client-js" + binaryTargets = ["native", "linux-musl-arm64-openssl-3.0.x"] } model Genre {