password moved from hard coded values to environment properties

[portal.git] / portal-BE / docker-compose.yml

diff --git a/portal-BE/docker-compose.yml b/portal-BE/docker-compose.yml
index 2228a99..33ae6b0 100644 (file)
--- a/portal-BE/docker-compose.yml
+++ b/portal-BE/docker-compose.yml
@@ -15,11 +15,11 @@ services:
     container_name: portal_mariaDB
     ports:
       - 3306:3306
-    restart: on-failure
+    restart: always
     environment:
       - MYSQL_DATABASE=testdb
-      - MYSQL_USER=portal
-      - MYSQL_PASSWORD=Test123456
+      - MYSQL_USER=${spring_datasource_username}
+      - MYSQL_PASSWORD=${spring_datasource_password}
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
@@ -29,9 +29,12 @@ services:
   portal-app:
     image: portal_app
     container_name: portal_APP
-    restart: on-failure
+    restart: always
     ports:
       - 8080:8080
+    environment:
+      - spring.datasource.username=${spring_datasource_username}
+      - spring.datasource.password=${spring_datasource_password}
     depends_on:
       - portal-db
     networks: