diff options
| -rw-r--r-- | packages/docker/pom.xml | 32 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/scripts/start-app.sh | 4 | ||||
| -rw-r--r-- | so-monitoring/so-monitoring-service/src/main/resources/application.yaml | 4 |
3 files changed, 37 insertions, 3 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index a8f8ee5f5a..3147c0206d 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -279,6 +279,31 @@ </assembly> </build> </image> + <image> + <name>onap/so/so-monitoring</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>docker-files</dockerFileDir> + <dockerFile>Dockerfile.so-app</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> + </tags> + <assembly> + <inline> + <dependencySets> + <dependencySet> + <includes> + <include>org.onap.so.monitoring:so-monitoring-service</include> + </includes> + <outputFileNameMapping>app.jar</outputFileNameMapping> + </dependencySet> + </dependencySets> + </inline> + </assembly> + </build> + </image> </images> </configuration> @@ -310,7 +335,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/so/catalog-db-adapter,onap/so/request-db-adapter,onap/so/sdnc-adapter,onap/so/openstack-adapter,onap/so/vfc-adapter,onap/so/sdc-controller,onap/so/bpmn-infra,onap/so/api-handler-infra</image> + <image>onap/so/catalog-db-adapter,onap/so/request-db-adapter,onap/so/sdnc-adapter,onap/so/openstack-adapter,onap/so/vfc-adapter,onap/so/sdc-controller,onap/so/bpmn-infra,onap/so/api-handler-infra,onap/so/so-monitoring</image> </configuration> </execution> </executions> @@ -368,5 +393,10 @@ <artifactId>mso-api-handler-infra</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.onap.so-monitoring</groupId> + <artifactId>so-monitoring-service</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> diff --git a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh index 7db4319195..143b1cf0b6 100644 --- a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh +++ b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh @@ -48,6 +48,10 @@ if [ ${APP} = "bpmn-infra" ]; then ln -s ${LOG_PATH} BPMN fi +if [ ${APP} = "so-monitoring" ]; then + ln -s ${LOG_PATH} MONITORING +fi + if [ ${APP} = "openstack-adapter" ]; then export DISABLE_SNI="-Djsse.enableSNIExtension=false" fi diff --git a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml index f21207474a..d1d2d00e94 100644 --- a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml +++ b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml @@ -13,5 +13,5 @@ mso: database: rest: api: - url: http://request-db-adapter:8083/infraActiveRequests/ - auth: Basic YnBlbDpwYXNzd29yZDEk
\ No newline at end of file + url: http://so-request-db-adapter:8083/infraActiveRequests/ + auth: Basic YnBlbDpwYXNzd29yZDEk |