From 3739fd408aa814135c320beadf69d064a4ec8f3e Mon Sep 17 00:00:00 2001
From: Mathilde Lorrain <mlorrain@takima.fr>
Date: Wed, 7 Feb 2024 10:33:28 +0100
Subject: [PATCH] ease docker conf
---
back-skeleton/.env.sample | 6 +++---
back-skeleton/docker-compose.yml | 8 ++++----
back-skeleton/src/main/resources/application.properties | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/back-skeleton/.env.sample b/back-skeleton/.env.sample
index edd4406..2e81d52 100644
--- a/back-skeleton/.env.sample
+++ b/back-skeleton/.env.sample
@@ -1,3 +1,3 @@
-DATABASE_USER=
-DATABASE_PASSWORD=
-DATABASE_NAME=
+DATABASE_USER=usr
+DATABASE_PASSWORD=pwd
+DATABASE_NAME=database
diff --git a/back-skeleton/docker-compose.yml b/back-skeleton/docker-compose.yml
index 1915a67..13c4347 100644
--- a/back-skeleton/docker-compose.yml
+++ b/back-skeleton/docker-compose.yml
@@ -7,11 +7,11 @@ services:
networks:
- db
env_file:
- - .env
+ - .env.sample
environment:
- POSTGRES_USER : ${DATABASE_USER}
- POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
- POSTGRES_DB: ${DATABASE_NAME}
+ POSTGRES_USER : usr
+ POSTGRES_PASSWORD: pwd
+ POSTGRES_DB: database
volumes:
- db-data:/var/lib/postgresql/data
- ./initdb:/docker-entrypoint-initdb.d:ro
diff --git a/back-skeleton/src/main/resources/application.properties b/back-skeleton/src/main/resources/application.properties
index fa51bd1..a4d6894 100644
--- a/back-skeleton/src/main/resources/application.properties
+++ b/back-skeleton/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/${DATABASE_NAME}
-spring.datasource.username=${DATABASE_USER}
-spring.datasource.password=${DATABASE_PASSWORD}
+spring.datasource.url=jdbc:postgresql://localhost:5432/${DATABASE_NAME:usr}
+spring.datasource.username=${DATABASE_USER:pwd}
+spring.datasource.password=${DATABASE_PASSWORD:database}
spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB
\ No newline at end of file
--
GitLab