From 252e13314785fb91003adcb9902a5f8dc8d86683 Mon Sep 17 00:00:00 2001
From: Steve Alphonse Siani <alphonse.steve.siani.djissitchi@ibm.com>
Date: Mon, 21 Jan 2019 11:55:48 -0500
Subject: ControllerBlueprint blueprintsProcessor container

Change-Id: I77df77757c276fca705091c1566c386f842269c4
Issue-ID: CCSDK-949
Signed-off-by: Steve Alphonse Siani <alphonse.steve.siani.djissitchi@ibm.com>
---
 ms/controllerblueprints/distribution/pom.xml       | 89 +++++++++++-----------
 .../distribution/src/main/dc/docker-compose.yaml   | 70 ++++++++---------
 .../distribution/src/main/docker/Dockerfile        |  3 +-
 .../distribution/src/main/docker/distribution.xml  |  6 ++
 .../distribution/src/main/docker/startService.sh   |  1 +
 5 files changed, 87 insertions(+), 82 deletions(-)
 mode change 100644 => 100755 ms/controllerblueprints/distribution/pom.xml
 mode change 100644 => 100755 ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
 mode change 100644 => 100755 ms/controllerblueprints/distribution/src/main/docker/Dockerfile
 mode change 100644 => 100755 ms/controllerblueprints/distribution/src/main/docker/distribution.xml
 mode change 100644 => 100755 ms/controllerblueprints/distribution/src/main/docker/startService.sh

(limited to 'ms/controllerblueprints/distribution')

diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
old mode 100644
new mode 100755
index 305712936..91d4bbca0
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.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.
@@ -30,10 +31,10 @@
         <name.space>org.onap.ccsdk.apps</name.space>     <!-- <name.space>${namespace}</name.space> -->
         <serviceArtifactName>controllerblueprints</serviceArtifactName>
         <image.name>onap/ccsdk-controllerblueprints</image.name>
-		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-		<docker.push.phase>deploy</docker.push.phase>
-		<docker.verbose>true</docker.verbose>
-	</properties>
+        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+        <docker.push.phase>deploy</docker.push.phase>
+        <docker.verbose>true</docker.verbose>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -120,20 +121,20 @@
                         </goals>
                         <configuration>
                             <source>
-                                println project.properties['ccsdk.project.version'];
-                                def versionArray;
+                                println project.properties['ccsdk.project.version']
+                                def versionArray
                                 if (project.properties['ccsdk.project.version'] != null ) {
-                                    versionArray = project.properties['ccsdk.project.version'].split('\\.');
+                                    versionArray = project.properties['ccsdk.project.version'].split('\\.')
                                 }
 
                                 if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
                                 {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"
                                 } else {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest";
+                                    project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest"
                                 }
 
-                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']
                             </source>
                         </configuration>
                     </execution>
@@ -143,34 +144,34 @@
         </plugins>
     </build>
 
-	<profiles>
-		<profile>
-			<id>docker</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>io.fabric8</groupId>
-						<artifactId>docker-maven-plugin</artifactId>
-						<version>0.26.1</version>
-						<inherited>false</inherited>
-						<configuration>
-							<images>
-								<image>
-									<name>${image.name}</name>
-									<build>
-										<cleanup>try</cleanup>
-										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-										<tags>
-											<tag>${project.version}</tag>
-											<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-											<tag>${project.docker.latesttag.version}</tag>
-										</tags>
-									</build>
-								</image>
-							</images>
-							<verbose>true</verbose>
-						</configuration>
-						<executions>
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.26.1</version>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <tags>
+                                            <tag>${project.version}</tag>
+                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.docker.latesttag.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                            <verbose>true</verbose>
+                        </configuration>
+                        <executions>
                             <execution>
                                 <id>generate-images</id>
                                 <phase>package</phase>
@@ -186,11 +187,11 @@
                                     <goal>push</goal>
                                 </goals>
                             </execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-	</profiles>
+    </profiles>
 </project>
diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
old mode 100644
new mode 100755
index eae24703b..232bfc016
--- 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
old mode 100644
new mode 100755
index 6de589dac..88577f5af
--- 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
old mode 100644
new mode 100755
index c929f98ef..1555b43e7
--- 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.
@@ -58,6 +59,11 @@
             <outputDirectory>./etc</outputDirectory>
             <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>
diff --git a/ms/controllerblueprints/distribution/src/main/docker/startService.sh b/ms/controllerblueprints/distribution/src/main/docker/startService.sh
old mode 100644
new mode 100755
index 7077c2246..84b2e5acf
--- 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
-- 
cgit 1.2.3-korg