.gitignore

@@ -2,4 +2,3 @@
 .idea
 keycloak/CAS/target
 docker-compose.yaml
-postgres/data

Makefile

@@ -27,7 +27,7 @@ dev-front: clean vite
 prod: clean
 	@cp config/prod.front.env front/MyINPulse-front/.env
 	@cp config/prod.main.env .env
-	@cp config/prod.docker-compose.yaml docker-compose.yaml
+	@cp config/frontdev.docker-compose.yaml docker-compose.yaml
 	@docker compose up -d --build
 
 

config/backdev.docker-compose.yaml

@@ -1,14 +1,15 @@
 services:
   postgres:
-    env_file: .env
+    image: postgres:latest
-    build:
-      context: postgres/
-      dockerfile: Dockerfile
     container_name: MyINPulse-DB
     ports:
-      - 5433:5432
+      - 5432:5432
     volumes:
-      - ./postgres/data:/var/lib/postgresql/data
+      - ./postgres:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
 
   keycloak:
     container_name: MyINPulse-keycloak

config/backdev.main.env

@@ -1,14 +1,10 @@
-POSTGRES_DB=postgres_db
+POSTGRES_DB=keycloak_db
-POSTGRES_USER=postgres
+POSTGRES_USER=keycloak_db_user
-POSTGRES_PASSWORD=postgres_db_user_password
+POSTGRES_PASSWORD=keycloak_db_user_password
-
 KEYCLOAK_ADMIN=admin
 KEYCLOAK_ADMIN_PASSWORD=admin
 KEYCLOAK_HOSTNAME=localhost
-KEYCLOAK_DB=keycloak_db
-KEYCLOAK_USER=keycloak_db_user
-KEYCLOAK_PASSWORD=keycloak_db_user_password
 
-BACKEND_DB=backend_db
+MYINPULSE_DB=MyINPulse_db
-BACKEND_USER=backend_db_user
+MYINPULSE_DB_USER=MyINPulse_db_user
-BACKEND_PASSWORD=backend_db_user_password
+MYINPULSE_DB_PASS=MyINPulse_db_user_pass

config/frontdev.docker-compose.yaml

@@ -1,15 +1,15 @@
 services:
   postgres:
-    env_file: .env
+    image: postgres:latest
-    build:
-      context: postgres/
-      dockerfile: Dockerfile
     container_name: MyINPulse-DB
     #ports:
     #  - 5432:5432
     volumes:
-      - ./postgres/data:/var/lib/postgresql/data
+      - ./postgres:/var/lib/postgresql/data
-
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
 
   keycloak:
     container_name: MyINPulse-keycloak

config/frontdev.main.env

@@ -1,14 +1,6 @@
-POSTGRES_DB=postgres_db
+POSTGRES_DB=keycloak_db
-POSTGRES_USER=postgres
+POSTGRES_USER=keycloak_db_user
-POSTGRES_PASSWORD=postgres_db_user_password
+POSTGRES_PASSWORD=keycloak_db_user_password
-
 KEYCLOAK_ADMIN=admin
 KEYCLOAK_ADMIN_PASSWORD=admin
-KEYCLOAK_HOSTNAME=localhost
+KEYCLOAK_HOSTNAME=localhost
-KEYCLOAK_DB=keycloak_db
-KEYCLOAK_USER=keycloak_db_user
-KEYCLOAK_PASSWORD=keycloak_db_user_password
-
-BACKEND_DB=backend_db
-BACKEND_USER=backend_db_user
-BACKEND_PASSWORD=backend_db_user_password

config/prod.docker-compose.yaml

@@ -1,14 +1,11 @@
 services:
   postgres:
-    env_file: .env
+    image: postgres:latest
-    build:
-      context: postgres/
-      dockerfile: Dockerfile
     container_name: MyINPulse-DB
     #ports:
     #  - 5432:5432
     volumes:
-      - ./postgres/data:/var/lib/postgresql/data
+      - ./postgres:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_USER: ${POSTGRES_USER}

config/prod.main.env

@@ -1,14 +1,6 @@
-POSTGRES_DB=postgres_db
+POSTGRES_DB=keycloak_db
-POSTGRES_USER=postgres
+POSTGRES_USER=keycloak_db_user
-POSTGRES_PASSWORD=postgres_db_user_password
+POSTGRES_PASSWORD=keycloak_db_user_password
-
 KEYCLOAK_ADMIN=admin
 KEYCLOAK_ADMIN_PASSWORD=admin
-KEYCLOAK_HOSTNAME=0549cd63f912d5dc9b31278d6f.eirb.fr
+KEYCLOAK_HOSTNAME=0549cd63f912d5dc9b31278d6f.eirb.fr
-KEYCLOAK_DB=keycloak_db
-KEYCLOAK_USER=keycloak_db_user
-KEYCLOAK_PASSWORD=keycloak_db_user_password
-
-BACKEND_DB=backend_db
-BACKEND_USER=backend_db_user
-BACKEND_PASSWORD=backend_db_user_password

postgres/Dockerfile

@@ -1,5 +0,0 @@
-FROM postgres:latest
-
-# Custom initialization scripts
-COPY ./create_user.sh   /docker-entrypoint-initdb.d/10-create_user.sh
-COPY ./create_db.sh     /docker-entrypoint-initdb.d/20-create_db.sh

postgres/create_db.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-POSTGRES="psql --username ${POSTGRES_USER}"
-
-echo "Creating database: ${DB_NAME}"
-
-$POSTGRES <<EOSQL
-CREATE DATABASE ${BACKEND_DB} OWNER ${BACKEND_USER};
-EOSQL
-
-
-echo "Creating database: ${DB_NAME}"
-
-$POSTGRES <<EOSQL
-CREATE DATABASE ${KEYCLOAK_DB} OWNER ${KEYCLOAK_USER};
-EOSQL

postgres/create_user.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-
-POSTGRES="psql --username ${POSTGRES_USER}"
-
-echo "Creating database role: [${BACKEND_USER}]"
-
-$POSTGRES <<-EOSQL
-CREATE USER ${BACKEND_USER} WITH CREATEDB PASSWORD '${BACKEND_PASSWORD}';
-EOSQL
-
-
-echo "Creating database role: ${KEYCLOAK_USER}"
-$POSTGRES <<-EOSQL
-CREATE USER ${KEYCLOAK_USER} WITH CREATEDB PASSWORD '${KEYCLOAK_PASSWORD}';
-EOSQL