From dae04c5a2fefec5722dde78e492e157e2ace639d Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Sun, 9 Jun 2024 21:43:53 -0300
Subject: [PATCH] docker

---
 Docker/scripts/deploy_database.sh   | 18 +++++++++++++++---
 Docker/scripts/generate_database.sh |  9 ++++++++-
 Dockerfile                          |  9 +++------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Docker/scripts/deploy_database.sh b/Docker/scripts/deploy_database.sh
index e8a44425..c9a6813a 100755
--- a/Docker/scripts/deploy_database.sh
+++ b/Docker/scripts/deploy_database.sh
@@ -8,10 +8,22 @@ fi
 
 if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]; then
     export DATABASE_URL
-    # ./node_modules/.bin/prisma migrate dev --name init --schema ./prisma/$DATABASE_PROVIDER-schema.prisma
-    # ./node_modules/.bin/prisma migrate deploy --schema=prisma/$DATABASE_PROVIDER-schema.prisma
-    # ./node_modules/.bin/prisma generate --schema=prisma/$DATABASE_PROVIDER-schema.prisma
+    echo "Deploying migrations for $DATABASE_PROVIDER"
+    echo "Database URL: $DATABASE_URL"
     npx prisma migrate deploy --schema ./prisma/$DATABASE_PROVIDER-schema.prisma
+    if [ $? -ne 0 ]; then
+        echo "Migration failed"
+        exit 1
+    else
+        echo "Migration succeeded"
+    fi
+    npx prisma generate --schema ./prisma/$DATABASE_PROVIDER-schema.prisma
+    if [ $? -ne 0 ]; then
+        echo "Prisma generate failed"
+        exit 1
+    else
+        echo "Prisma generate succeeded"
+    fi
 else
     echo "Error: Database provider $DATABASE_PROVIDER invalid."
     exit 1
diff --git a/Docker/scripts/generate_database.sh b/Docker/scripts/generate_database.sh
index 4b08b5e8..570a60d8 100644
--- a/Docker/scripts/generate_database.sh
+++ b/Docker/scripts/generate_database.sh
@@ -8,8 +8,15 @@ fi
 
 if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]; then
     export DATABASE_URL
+    echo "Generating database for $DATABASE_PROVIDER"
     echo "Database URL: $DATABASE_URL"
-    ./node_modules/.bin/prisma generate --schema=prisma/$DATABASE_PROVIDER-schema.prisma
+    npx prisma generate --schema=prisma/$DATABASE_PROVIDER-schema.prisma
+    if [ $? -ne 0 ]; then
+        echo "Prisma generate failed"
+        exit 1
+    else
+        echo "Prisma generate succeeded"
+    fi
 else
     echo "Error: Database provider $DATABASE_PROVIDER invalid."
     exit 1
diff --git a/Dockerfile b/Dockerfile
index 320046f5..0852b00a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,8 @@
 FROM node:20-bullseye-slim AS base
 
-RUN apt-get update -y
-RUN apt-get upgrade -y
-
-RUN apt-get install -y git tzdata ffmpeg wget curl
-
-RUN npm i -g npm@latest
+RUN apt-get update -y && apt-get upgrade -y && \
+    apt-get install -y git tzdata ffmpeg wget curl && \
+    npm i -g npm@latest
 
 FROM base AS builder