Merge "ControllerBlueprint blueprintsProcessor container"

4 files changed, 42 insertions, 38 deletions

diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
index eae24703b..232bfc016 100644..100755
--- a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
+++ b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
@@ -1,37 +1,33 @@
-version: '3.3'
-
-services:
-   db:
-     image: mariadb:latest
-     container_name: cb-mariadb
-     ports:
-       - "3306:3306"
-     volumes:
-       - ~/vm_mysql:/var/lib/mysql
-     restart: always
-     environment:
-       MYSQL_ROOT_PASSWORD: sdnctl
-       MYSQL_DATABASE: sdnctl
-       MYSQL_USER: sdnctl
-       MYSQL_PASSWORD: sdnctl
-   controller-blueprints:
-     depends_on:
-       - db
-     image: onap/ccsdk-controllerblueprints:latest
-     container_name: cb-rest
-     ports:
-       - "8080:8080"
-     restart: always
-     volumes:
-       - ~/share/vm_ms/controllerblueprints/config:/opt/app/onap/config
-       - ~/share/vm_ms/controllerblueprints/logs:/logs
-     environment:
-       APPLICATIONNAME : ControllerBluePrints
-       BUNDLEVERSION: 1.0.0
-       APP_CONFIG_HOME: /opt/app/onap/config
-       DB_URL: jdbc:mysql://db:3306/sdnctl
-       DB_USER: sdnctl
-       DB_PASSWORD: sdnctl
-       INIT_DATA_LOAD: "true"
-       STICKYSELECTORKEY:
-       ENVCONTEXT: DEV
\ No newline at end of file
+version: '3.3'

+

+services:

+  db:

+    image: mariadb:latest

+    container_name: ccsdk-mariadb

+    ports:

+    - "3306:3306"

+    volumes:

+    - ~/vm_mysql:/var/lib/mysql

+    restart: always

+    environment:

+      MYSQL_ROOT_PASSWORD: sdnctl

+      MYSQL_DATABASE: sdnctl

+      MYSQL_USER: sdnctl

+      MYSQL_PASSWORD: sdnctl

+  controller-blueprints:

+    depends_on:

+    - db

+    image: onap/ccsdk-controllerblueprints:latest

+    container_name: cb-rest

+    ports:

+    - "8080:8080"

+    restart: always

+    volumes:

+    - ~/share/vm_ms/controllerblueprints/config:/opt/app/onap/config

+    - ~/share/vm_ms/controllerblueprints/logs:/logs

+    environment:

+      APPLICATIONNAME: ControllerBluePrints

+      BUNDLEVERSION: 1.0.0

+      APP_CONFIG_HOME: /opt/app/onap/config

+      STICKYSELECTORKEY:

+      ENVCONTEXT: dev
\ No newline at end of file
diff --git a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
index 6de589dac..88577f5af 100644..100755
--- a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
+++ b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
@@ -15,6 +15,7 @@ RUN (mkdir -p /source /opt/app/onap) && (tar -xzf /source.tar.gz -C /source) \
 && (cp -rf /source/app/opt/app/onap/lib /opt/app/onap/) \
 && (cp -rf /source/app/etc /) \
 && (cp -rf /source/app/model-catalog /) \
+&& (cp -rf /source/app/config /) \
 && (rm -rf /source)
 
-ENTRYPOINT /startService.sh
+ENTRYPOINT /startService.sh
\ No newline at end of file
diff --git a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
index c929f98ef..1555b43e7 100644..100755
--- a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
+++ b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright © 2017-2018 AT&T Intellectual Property.
+  ~ Modifications Copyright © 2019 Bell Canada.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -59,6 +60,11 @@
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
+            <directory>${project.basedir}/../application/opt/app/onap/config</directory>
+            <outputDirectory>./config</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+        <fileSet>
             <directory>${project.basedir}/../../../components/model-catalog</directory>
             <outputDirectory>./model-catalog</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
diff --git a/ms/controllerblueprints/distribution/src/main/docker/startService.sh b/ms/controllerblueprints/distribution/src/main/docker/startService.sh
index 7077c2246..84b2e5acf 100644..100755
--- a/ms/controllerblueprints/distribution/src/main/docker/startService.sh
+++ b/ms/controllerblueprints/distribution/src/main/docker/startService.sh
@@ -5,4 +5,5 @@ nodeName=ControllerBlueprints_1.0.0_$(cat /proc/self/cgroup | grep docker | sed
 echo "APP Config HOME : ${APP_CONFIG_HOME}"
 export APP_HOME=/opt/app/onap
 
+cp -rf /config /opt/app/onap/
 source /etc/run.source