From ccc609a17bf7d79e1baaeef70347f3a47ad7caf4 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 21 Aug 2019 09:32:32 +0200 Subject: [PATCH] prepare demo for docker-compose --- .../resources/config/application-demo.properties | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/resources/config/application-demo.properties b/src/main/resources/config/application-demo.properties index 610d2b50..74914f2c 100644 --- a/src/main/resources/config/application-demo.properties +++ b/src/main/resources/config/application-demo.properties @@ -5,17 +5,14 @@ server.servlet.context-path=/ server.servlet.session.cookie.http-only=true server.servlet.session.tracking-modes=cookie +# database server +datastore.mariadb.server.address=seb-server-mariadb +datastore.mariadb.server.port=3306 + # data source configuration - -# spring.h2.console.enabled=true -# spring.datasource.platform=h2 -# spring.datasource.url=jdbc:h2:mem:demo;MODE=MySQL;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -# spring.datasource.driver-class-name=org.h2.Driver - spring.datasource.initialize=true spring.datasource.initialization-mode=always -# NOTE: try to connect to a mariadb server on a docker container named seb-server-mariadb within the same (docker)network -spring.datasource.url=jdbc:mariadb://seb-server-mariadb:3306/SEBServer?useSSL=false&createDatabaseIfNotExist=true +spring.datasource.url=jdbc:mariadb://${datastore.mariadb.server.address}:${datastore.mariadb.server.port}/SEBServer?useSSL=false&createDatabaseIfNotExist=true spring.datasource.driver-class-name=org.mariadb.jdbc.Driver spring.datasource.platform=demo