diff options
Diffstat (limited to 'ms/controllerblueprints/application')
5 files changed, 31 insertions, 177 deletions
diff --git a/ms/controllerblueprints/application/pom.xml b/ms/controllerblueprints/application/pom.xml index 19fd9c72d..4e781ad1b 100644 --- a/ms/controllerblueprints/application/pom.xml +++ b/ms/controllerblueprints/application/pom.xml @@ -21,24 +21,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.ccsdk.apps</groupId>
- <artifactId>controllerblueprints-parent</artifactId>
+ <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+ <artifactId>parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
- <artifactId>controllerblueprints-application</artifactId>
+ <artifactId>application</artifactId>
<name>Controller Blueprints Application</name>
<properties>
<swagger.directory>${basedir}/src/main/resources/swagger-ui/dist</swagger.directory>
<java.version>1.8</java.version>
- <docker.registry>xxxxxxxxx:5100</docker.registry>
- <assembly.id>distribution</assembly.id>
- <build.number>local</build.number>
<name.space>org.onap.ccsdk.apps</name.space> <!-- <name.space>${namespace}</name.space> -->
- <grm.namespace>org.onap.ccsdk.apps</grm.namespace>
- <archetypeVersion>200.0.49</archetypeVersion>
<serviceArtifactName>controllerblueprints</serviceArtifactName>
-
<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -50,15 +44,12 @@ <sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.language>java</sonar.language>
<ilib.version>2.0.7</ilib.version>
- <!--<skip.assembly>false</skip.assembly>-->
- <!--<skip.swagger.generation>false</skip.swagger.generation>-->
</properties>
<dependencies>
-
<dependency>
- <groupId>org.onap.ccsdk.apps</groupId>
- <artifactId>controllerblueprints-service</artifactId>
+ <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+ <artifactId>service</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -102,17 +93,35 @@ </includes>
<filtering>true</filtering>
</resource>
- <resource>
- <directory>src/main/docker</directory>
- <targetPath>${basedir}/target</targetPath>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
</resources>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-dockerfile</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals><!-- here the phase you need -->
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.5.201505241946</version>
@@ -167,28 +176,6 @@ </executions>
</plugin>
<plugin>
- <!--build the final artifact for docker deployment -->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <!-- <skipAssembly>${skip.assembly}</skipAssembly>-->
- <outputDirectory>target</outputDirectory>
- <descriptors>
- <descriptor>src/assembly/distribution.xml</descriptor>
- </descriptors>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>${assembly.id}</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
diff --git a/ms/controllerblueprints/application/src/assembly/distribution.xml b/ms/controllerblueprints/application/src/assembly/distribution.xml deleted file mode 100644 index c58c20d78..000000000 --- a/ms/controllerblueprints/application/src/assembly/distribution.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Copyright © 2017-2018 AT&T Intellectual Property. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - <!-- create a tar.gz file containing the projects dependencies --> - <id>${assembly.id}</id> - <formats> - <format>tar.gz</format> - </formats> - <dependencySets> - <dependencySet> - <outputDirectory>/opt/app/onap/lib</outputDirectory> - <excludes> - </excludes> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>${project.basedir}/src/main/resources</directory> - <includes> - <include>application.properties</include> - </includes> - <outputDirectory>/</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/docker</directory> - <includes> - <include>Dockerfile</include> - <include>startService.sh</include> - </includes> - <outputDirectory>/</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/groovy</directory> - <outputDirectory>src/main/groovy</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/resources</directory> - <outputDirectory>src/main/resources</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/etc</directory> - <outputDirectory>/etc</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/load</directory> - <outputDirectory>load</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - </fileSets> -</assembly> diff --git a/ms/controllerblueprints/application/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/application/src/main/dc/docker-compose.yaml deleted file mode 100644 index 5696d02b3..000000000 --- a/ms/controllerblueprints/application/src/main/dc/docker-compose.yaml +++ /dev/null @@ -1,36 +0,0 @@ -version: '3.3'
-
-services:
- db:
- image: mysql:5.7.22
- container_name: cb-mysql
- ports:
- - "3307: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/controllerblueprints:1.0.0
- 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:
- DB_URL: jdbc:mysql://db:3306/sdnctl
- DB_USER: sdnctl
- DB_PASSWORD: sdnctl
- INIT_DATA_LOAD: "true"
- APP_CONFIG_HOME: /opt/app/onap/config
- BUNDLEVERSION: 1.0.0
- STICKYSELECTORKEY:
- ENVCONTEXT: DEV
\ No newline at end of file diff --git a/ms/controllerblueprints/application/src/main/docker/Dockerfile b/ms/controllerblueprints/application/src/main/docker/Dockerfile deleted file mode 100644 index 06304e1db..000000000 --- a/ms/controllerblueprints/application/src/main/docker/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM anapsix/alpine-java:8_jdk - -RUN apk add --no-cache curl - -COPY startService.sh /startService.sh -RUN chmod 777 /startService.sh && dos2unix /startService.sh - -COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz - -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 /) \ -&& (rm -rf /source) - -ENTRYPOINT /startService.sh diff --git a/ms/controllerblueprints/application/src/main/docker/startService.sh b/ms/controllerblueprints/application/src/main/docker/startService.sh deleted file mode 100644 index 7077c2246..000000000 --- a/ms/controllerblueprints/application/src/main/docker/startService.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -nodeName=ControllerBlueprints_1.0.0_$(cat /proc/self/cgroup | grep docker | sed s/\\//\\n/g | tail -1) - -echo "APP Config HOME : ${APP_CONFIG_HOME}" -export APP_HOME=/opt/app/onap - -source /etc/run.source |