diff --git a/back-skeleton/.env.sample b/back-skeleton/.env.sample index edd4406493c73a3c782297f00196af8d88a90aa3..2e81d52f90a6c419e08c62ed6208cac3087ab681 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 1915a6783c4f1f5700eb9598adc2142232a3b385..13c4347541e62d8388f4221511ad573af4e317e4 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 fa51bd1222e8582f6ce7ce4505355d904e98ea46..a4d6894569ebafad09d83b8be760a1cd24ffaf39 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