From 935d8fc7909423defa1d1368b0304446f5a2c377 Mon Sep 17 00:00:00 2001
From: Florian THIERRY <florian.thierry72@gmail.com>
Date: Sat, 31 Jul 2021 18:33:17 +0200
Subject: [PATCH] Adding of database initialization.

---
 docker-compose.yml                                  | 13 +++++++++++++
 docker/database/Dockerfile                          |  3 +++
 docker/database/scripts/00-init_env.sh              |  3 +++
 .../cerberus/cerberusapp/CerberusApplication.java   |  2 --
 src/main/resources/application.yml                  |  4 ++--
 5 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose.yml
 create mode 100644 docker/database/Dockerfile
 create mode 100644 docker/database/scripts/00-init_env.sh

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..3a0d135
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '3.6'
+services:
+  database:
+    build: "./docker/database"
+    container_name: "cerberus-database"
+    volumes:
+      - ./docker/database/var/lib/postgresql/data:/var/lib/postgresql/data
+    environment:
+      - "POSTGRES_DB=db_cerberus"
+      - "POSTGRES_USER=cerberus"
+      - "POSTGRES_PASSWORD=P@ssword1"
+    ports:
+      - "5432:5432"
\ No newline at end of file
diff --git a/docker/database/Dockerfile b/docker/database/Dockerfile
new file mode 100644
index 0000000..75207bf
--- /dev/null
+++ b/docker/database/Dockerfile
@@ -0,0 +1,3 @@
+FROM postgres:13
+RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8
+ENV LANG fr_FR.utf8
\ No newline at end of file
diff --git a/docker/database/scripts/00-init_env.sh b/docker/database/scripts/00-init_env.sh
new file mode 100644
index 0000000..d036cb8
--- /dev/null
+++ b/docker/database/scripts/00-init_env.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
\ No newline at end of file
diff --git a/src/main/java/org/takiguchi/cerberus/cerberusapp/CerberusApplication.java b/src/main/java/org/takiguchi/cerberus/cerberusapp/CerberusApplication.java
index 10c387e..d8b1a90 100644
--- a/src/main/java/org/takiguchi/cerberus/cerberusapp/CerberusApplication.java
+++ b/src/main/java/org/takiguchi/cerberus/cerberusapp/CerberusApplication.java
@@ -5,9 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class CerberusApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(CerberusApplication.class, args);
 	}
-
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c8c6d4f..4e76f91 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@ spring:
   # -------------------------------------------------
   datasource:
     driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://localhost:50001/cerberus
-    username: h23
+    url: jdbc:postgresql://localhost:5432/db_cerberus
+    username: cerberus
     password: P@ssword1
   # Disable feature detection by this undocumented parameter.
   # Check the org.hibernate.engine.jdbc.internal.JdbcServiceImpl.configure method for more details.