Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP
diff --git a/addressImport/src/main/resources/application.yml b/addressImport/src/main/resources/application.yml
index 4529768..eeab8ac 100644
--- a/addressImport/src/main/resources/application.yml
+++ b/addressImport/src/main/resources/application.yml
@@ -13,18 +13,18 @@
spring:
datasource:
## ---- postgres ---------------------------------------------------
-# url: jdbc:postgresql://entopticadirx:5432/GridFailureInfoDevServer
-# username: ${GFI_DB_USERNAME}
-# password: ${GFI_DB_PASSWORD}
+ url: jdbc:postgresql://entopticadirx:5432/GridFailureInfoDevServer
+ username: ${GFI_DB_USERNAME}
+ password: ${GFI_DB_PASSWORD}
# ------------------------------------------------------------------
## ---- oracle -----------------------------------------------------
- enable-oracle-configuration: true
- url: jdbc:oracle:thin:@LIDLORADB2.PTA.DE:1521:NAPDB00
- username: dietricf
- password: dietricf000
+# enable-oracle-configuration: true
+# url: jdbc:oracle:thin:@LIDLORADB2.PTA.DE:1521:NAPDB00
+# username: dietricf
+# password: dietricf000
# jpa:
- database-platform: org.hibernate.dialect.Oracle10gDialect
- show-sql: false
+# database-platform: org.hibernate.dialect.Oracle10gDialect
+# show-sql: false
#
oracle:
ucp:
diff --git a/gfsBackendService/Dockerfile_DevServer b/gfsBackendService/Dockerfile_DevServer
index 0c4f871..4cfb8c6 100644
--- a/gfsBackendService/Dockerfile_DevServer
+++ b/gfsBackendService/Dockerfile_DevServer
@@ -22,4 +22,4 @@
COPY /target/grid-failure-information.backend.service.jar /usr/src/cbd/
WORKDIR usr/src/cbd
-CMD ["java", "-jar", "-Dspring.profiles.active=oracle", "grid-failure-information.backend.service.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "-Dspring.profiles.active=devserver", "grid-failure-information.backend.service.jar"]
\ No newline at end of file
