aboutsummaryrefslogtreecommitdiffstats
path: root/ms/neng/src/main/compose
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-11-11 13:13:42 -0500
committerDan Timoney <dtimoney@att.com>2020-11-11 13:13:42 -0500
commit42624f16cadb0e6bf1c4f9317c4c287a274a1c89 (patch)
treeb1890dd2ffdb090d7ac2a6b24bcd2e8bdcd2cbd2 /ms/neng/src/main/compose
parent3504bad8d098ce09340a93e7916b20ae422d4497 (diff)
Fix initialization errors
Updated database initialization to correctly handle differences between mysql/mariadb syntax and h2 syntax. Change-Id: I6f2732da5d26201fc61ef8de7d30e3137220c184 Issue-ID: CCSDK-2978 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'ms/neng/src/main/compose')
-rw-r--r--ms/neng/src/main/compose/docker-compose.yaml22
1 files changed, 13 insertions, 9 deletions
diff --git a/ms/neng/src/main/compose/docker-compose.yaml b/ms/neng/src/main/compose/docker-compose.yaml
index 93dbbf0d..09c588a0 100644
--- a/ms/neng/src/main/compose/docker-compose.yaml
+++ b/ms/neng/src/main/compose/docker-compose.yaml
@@ -1,11 +1,13 @@
+version: '2.1'
-nengdb:
- image: mariadb
+services:
+ nengdb:
+ image: mariadb:10.5
container_name: nengdb
ports:
- "${NENG_DB_PORT}:3306"
- volumes:
- - /var/lib/nengdb:/var/lib/mysql
+ #volumes:
+ # - /var/lib/nengdb:/var/lib/mysql
restart: always
environment:
MYSQL_ROOT_PASSWORD: "${NENG_DB_ROOT}"
@@ -13,17 +15,19 @@ nengdb:
MYSQL_USER: "${NENG_DB_USER}"
MYSQL_PASSWORD: "${NENG_DB_PASS}"
-neng:
- #depends_on:
- #- nengdb
- image: onap/ccsdk-apps-ms-neng
+ neng:
+ depends_on :
+ - nengdb
+ image: onap/ccsdk-apps-ms-neng:latest
container_name: neng
ports:
- "${NENG_SERV_PORT}:8080"
restart: always
+ links:
+ - nengdb:mariadb-galera
environment:
SPRING_PROFILE: "${SPRING_PROFILE}"
- NENG_DB_URL: "${NENG_DB_URL}"
+ NENG_DB_URL: "jdbc:mysql://mariadb-galera:3306/neng"
NENG_DB_USER: "${NENG_DB_USER}"
NENG_DB_PASS: "${NENG_DB_PASS}"