summaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints/distribution
diff options
context:
space:
mode:
authorMuthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>2018-11-10 18:02:29 -0500
committerMuthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>2018-11-10 18:02:29 -0500
commit9a85b3d441c11813d3dbe7ed487d475993c2e0a3 (patch)
treeab3471cdb730ff02363a9d59939f47ad0d082167 /ms/controllerblueprints/distribution
parenta9bf0541c65d8bb81b814bd85253cf4518fcb52b (diff)
Controller Blueprints Microservice
Change Application Properties and Docker Blueprint model load Parameters. Change-Id: I799cbab4388916c8e07e9453d93214e788a16fa2 Issue-ID: CCSDK-660 Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
Diffstat (limited to 'ms/controllerblueprints/distribution')
-rw-r--r--ms/controllerblueprints/distribution/pom.xml2
-rw-r--r--ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml2
-rw-r--r--ms/controllerblueprints/distribution/src/main/docker/Dockerfile2
-rw-r--r--ms/controllerblueprints/distribution/src/main/docker/distribution.xml9
4 files changed, 5 insertions, 10 deletions
diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
index d3bff091..33690024 100644
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.xml
@@ -94,7 +94,7 @@
<plugin>
<!--build the final artifact for docker deployment -->
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
<configuration>
<!-- <skipAssembly>${skip.assembly}</skipAssembly>-->
<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
index 3c146469..dd219084 100644
--- a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
+++ b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
image: mariadb:latest
container_name: cb-mariadb
ports:
- - "3307:3306"
+ - "3306:3306"
volumes:
- ~/vm_mysql:/var/lib/mysql
restart: always
diff --git a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
index a2f453f2..6de589da 100644
--- a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
+++ b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN (mkdir -p /source /opt/app/onap) && (tar -xzf /source.tar.gz -C /source) \
&& (mv /source/@project.build.finalName@ /source/app) \
&& (cp -rf /source/app/opt/app/onap/lib /opt/app/onap/) \
&& (cp -rf /source/app/etc /) \
-&& (cp -rf /source/app/load /) \
+&& (cp -rf /source/app/model-catalog /) \
&& (rm -rf /source)
ENTRYPOINT /startService.sh
diff --git a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
index f2f3cb0b..c929f98e 100644
--- a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
+++ b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
@@ -49,11 +49,6 @@
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../application/src/main/groovy</directory>
- <outputDirectory>src/main/groovy</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../application/src/main/resources</directory>
<outputDirectory>src/main/resources</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
@@ -64,8 +59,8 @@
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../application/load</directory>
- <outputDirectory>load</outputDirectory>
+ <directory>${project.basedir}/../../../components/model-catalog</directory>
+ <outputDirectory>./model-catalog</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>