From fce60c10c716b496a70eed915f925355e662748a Mon Sep 17 00:00:00 2001
From: Roberto Callari <robertocallari89@gmail.com>
Date: Thu, 13 Oct 2022 15:08:22 +0200
Subject: [PATCH] upd
---
docker-compose.yml | 8 +++++---
src/main/resources/application.properties | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index e360a12..85c9335 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,9 @@ services:
ports:
- 5432:5432
environment:
- - POSTGRES_PASSWORD=postgres
- - POSTGRES_USER=postgres
- - POSTGRES_DB=dashboarddb
+ - POSTGRES_PASSWORD=postgres
+ - POSTGRES_USER=postgres
+ - POSTGRES_DB=dashboarddb
networks:
- urbanite-network
@@ -27,6 +27,8 @@ services:
- SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/dashboarddb
- IDM_USER4VIEW_USERNAME=urbanite
- IDM_USER4VIEW_PASSWORD=urbanite
+ - POSTGRES_USERNAME=postgres
+ - POSTGRES_PASSWORD=postgres
#expose:
# - 8085
ports:
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6c3879c..988f0ce 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,8 +5,8 @@ server.port=8085
spring.datasource.url=jdbc:postgresql://localhost:5432/dashboarddb
spring.datasource.driver-class-name=org.postgresql.Driver
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.username=${POSTGRES_USERNAME:postgres}
+spring.datasource.password=${POSTGRES_PASSWORD:postgres}
spring.jpa.show-sql=true
spring.jpa.generate-ddl=true
#spring.jpa.hibernate.ddl-auto=create
--
GitLab