Domain model change

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

diff --git a/portal-BE/docker-compose.yml b/portal-BE/docker-compose.yml
index 7c44e82..9b8f1ed 100644 (file)
--- a/portal-BE/docker-compose.yml
+++ b/portal-BE/docker-compose.yml
@@ -6,14 +6,22 @@
 # docker login -u USER -p PASS nexus3.onap.org:10001
 # Uses healthcheck feature added in docker-compose v2.1
 
-version: '2.1'
+version: '3.1'
 
 services:
   portal-db:
-    image: portal_mariadb
+    image: mariadb
+#    image: mysql
     container_name: portal_mariaDB
+    ports:
+      - 3306:3306
+    restart: always
     environment:
-      MYSQL_DATABASE: testdb
+      - MYSQL_DATABASE=testdb
+      - MYSQL_USER=${spring_datasource_username}
+      - MYSQL_PASSWORD=${spring_datasource_password}
+      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+      - MYSQL_INITDB_SKIP_TZINFO=1
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
     networks:
@@ -22,12 +30,14 @@ 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:
-        condition: service_healthy
+      - portal-db
     networks:
       - backend