From 690a242a7899a9e6808d6f949320da1b19f48453 Mon Sep 17 00:00:00 2001
From: Nemo D'ACREMONT <nemo.d'acremont@enseirb-matmeca.fr>
Date: Sat, 23 Nov 2024 11:53:52 +0100
Subject: [PATCH] feat: fix db script exec order, onlyl use back-end.env files

---
 .env.example                                   | 6 ------
 PostgreSQL/Dockerfile                          | 3 +--
 PostgreSQL/{drop.sql => build/00_drop.sql}     | 0
 PostgreSQL/{create.sql => build/10_create.sql} | 0
 PostgreSQL/{insert.sql => build/20_insert.sql} | 0
 PostgreSQL/{ => build}/select.sql              | 0
 PostgreSQL/{ => build}/update.sql              | 0
 back-end/Dockerfile.back                       | 8 +++++---
 docker-compose.dev.yml                         | 1 +
 docker-compose.prod.yml                        | 1 +
 10 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 .env.example
 rename PostgreSQL/{drop.sql => build/00_drop.sql} (100%)
 rename PostgreSQL/{create.sql => build/10_create.sql} (100%)
 rename PostgreSQL/{insert.sql => build/20_insert.sql} (100%)
 rename PostgreSQL/{ => build}/select.sql (100%)
 rename PostgreSQL/{ => build}/update.sql (100%)

diff --git a/.env.example b/.env.example
deleted file mode 100644
index a09dcaf..0000000
--- a/.env.example
+++ /dev/null
@@ -1,6 +0,0 @@
-NODE_PORT=3000
-NODE_ENV=dev
-DB_HOST=localhost
-DB_NAME=briques_db
-DB_USER=briques_llm
-DB_PASSWORD=briques_password_2025
\ No newline at end of file
diff --git a/PostgreSQL/Dockerfile b/PostgreSQL/Dockerfile
index 7207c30..06a7396 100644
--- a/PostgreSQL/Dockerfile
+++ b/PostgreSQL/Dockerfile
@@ -3,5 +3,4 @@ FROM postgres:17
 WORKDIR /db
 
 # postgresql will execute the files in that folder after build
-COPY create.sql drop.sql insert.sql select.sql update.sql /docker-entrypoint-initdb.d/
-
+COPY build/* /docker-entrypoint-initdb.d/
diff --git a/PostgreSQL/drop.sql b/PostgreSQL/build/00_drop.sql
similarity index 100%
rename from PostgreSQL/drop.sql
rename to PostgreSQL/build/00_drop.sql
diff --git a/PostgreSQL/create.sql b/PostgreSQL/build/10_create.sql
similarity index 100%
rename from PostgreSQL/create.sql
rename to PostgreSQL/build/10_create.sql
diff --git a/PostgreSQL/insert.sql b/PostgreSQL/build/20_insert.sql
similarity index 100%
rename from PostgreSQL/insert.sql
rename to PostgreSQL/build/20_insert.sql
diff --git a/PostgreSQL/select.sql b/PostgreSQL/build/select.sql
similarity index 100%
rename from PostgreSQL/select.sql
rename to PostgreSQL/build/select.sql
diff --git a/PostgreSQL/update.sql b/PostgreSQL/build/update.sql
similarity index 100%
rename from PostgreSQL/update.sql
rename to PostgreSQL/build/update.sql
diff --git a/back-end/Dockerfile.back b/back-end/Dockerfile.back
index b98e101..3d3934e 100644
--- a/back-end/Dockerfile.back
+++ b/back-end/Dockerfile.back
@@ -6,11 +6,12 @@ WORKDIR /usr/src/back
 
 # Copy sources
 COPY . .
-COPY .env.production .env
 
 # install deps, and pm2 to run the app
 RUN npm install
-RUN npm install -g pm2
+# RUN npm install -g pm2
+
+COPY .env.production .env
 
 # Compilation des fichiers TypeScript
 RUN npm run build
@@ -23,4 +24,5 @@ RUN chmod -R u=rwx,g=,o= ./
 EXPOSE 3000
 
 # Start app
-CMD ["pm2", "start", "dist/app.js", "--no-daemon"]
+CMD ["npm", "run", "startonly"]
+# CMD ["pm2", "start", "dist/app.js", "--no-daemon"]
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index e0f4937..f4a270e 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -2,6 +2,7 @@ services:
   database:
     hostname: database
     container_name: briques_postgres
+    env_file: back-end/.env
     build:
       context: ./PostgreSQL
       dockerfile: Dockerfile
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index a91d176..ada642e 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,6 +6,7 @@ services:
       context: ./PostgreSQL
       dockerfile: Dockerfile
     restart: always
+    env_file: back-end/.env.production
     environment:
       - POSTGRES_DB=${DB_NAME}
       - POSTGRES_USER=${DB_USER}