diff options
author | 2018-08-17 15:58:10 +0000 | |
---|---|---|
committer | 2018-08-17 15:58:10 +0000 | |
commit | e3d9e2b6ed6a4958ded1ac0cbcac7c9cee2fe334 (patch) | |
tree | aa75d0833ee006d606398d08d2fb482cfd6fe067 /pomba/network-discovery | |
parent | 705c39c8274ceefebe0d8fd6c7bcd741e1bb6797 (diff) | |
parent | 4083ef5710e8851cd505dc264469c7342126d093 (diff) |
Merge "Docker file: networkDiscovery serviceDecomposition"
Diffstat (limited to 'pomba/network-discovery')
-rw-r--r-- | pomba/network-discovery/pom.xml | 235 | ||||
-rw-r--r-- | pomba/network-discovery/src/main/docker/Dockerfile | 22 | ||||
-rw-r--r-- | pomba/network-discovery/src/main/docker/startService.sh | 8 |
3 files changed, 223 insertions, 42 deletions
diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml index 44e919b..8f0d725 100644 --- a/pomba/network-discovery/pom.xml +++ b/pomba/network-discovery/pom.xml @@ -32,6 +32,9 @@ limitations under the License. <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory> + <!--docker --> + <docker.tag>${project.version}-${timestamp}</docker.tag> + <docker.latest.tag>${project.version}-latest</docker.latest.tag> </properties> <dependencyManagement> @@ -134,48 +137,9 @@ limitations under the License. </dependencies> <build> - <finalName>network-discovery</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> - <groupId>com.github.kongchen</groupId> - <artifactId>swagger-maven-plugin</artifactId> - <version>3.1.7</version> - <configuration> - <apiSources> - <apiSource> - <locations> - <location>org.onap.sdnc.apps.pomba.networkdiscovery.service.rs</location> - </locations> - <basePath>/network-discovery</basePath> - <info> - <title>Network Discovery API</title> - <version>${project.version}</version> - <termsOfService>http://onap.org</termsOfService> - <contact> - <name>Sharon Chisholm</name> - <email>sharon.chisholm@amdocs.com</email> - </contact> - </info> - <securityDefinitions> - <securityDefinition> - <name>basicAuth</name> - <type>basic</type> - </securityDefinition> - </securityDefinitions> - <swaggerDirectory>${swagger.directory}</swaggerDirectory> - </apiSource> - </apiSources> - </configuration> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>3.1.0</version> <executions> @@ -210,8 +174,7 @@ limitations under the License. </executions> </plugin> </plugins> - <!-- mention the logback.xml location through system property or environment variable to edit logback.xml at run - time --> + <!-- mention the logback.xml location through system property or environment variable to edit logback.xml at run time --> <resources> <resource> <directory>src/main/resources</directory> @@ -222,4 +185,192 @@ limitations under the License. </resource> </resources> </build> + + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.19.1</version> + <configuration> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <images> + <image> + <name>onap/${project.artifactId}</name> + <alias>${project.artifactId}</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.basedir}/target/docker-stage</dockerFileDir> + <tags> + <tag>${docker.snapshot.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>generate-images</id> + <phase>generate-sources</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.github.kongchen</groupId> + <artifactId>swagger-maven-plugin</artifactId> + <version>3.1.7</version> + <configuration> + <apiSources> + <apiSource> + <locations> + <location>org.onap.sdnc.apps.pomba.networkdiscovery.service.rs</location> + </locations> + <basePath>/network-discovery</basePath> + <info> + <title>Network Discovery API</title> + <version>${project.version}</version> + <termsOfService>http://onap.org</termsOfService> + </info> + <securityDefinitions> + <securityDefinition> + <name>basicAuth</name> + <type>basic</type> + </securityDefinition> + </securityDefinitions> + <swaggerDirectory>${swagger.directory}</swaggerDirectory> + </apiSource> + </apiSources> + </configuration> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + <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>package</phase> + <configuration> + <outputDirectory>${project.basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-properties</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>package</phase> + <configuration> + <outputDirectory>${project.basedir}/target/docker-stage/config</outputDirectory> + <resources> + <resource> + <directory>config</directory> + <includes> + <include>*.properties</include> + <include>*.xml</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-certificate</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>package</phase> + <configuration> + <outputDirectory>${project.basedir}/target/docker-stage/config/auth</outputDirectory> + <resources> + <resource> + <directory>auth</directory> + <includes> + <include>*.p12</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-script</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>package</phase> + <configuration> + <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>*.sh</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-jar</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>package</phase> + <configuration> + <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory> + <resources> + <resource> + <directory>target</directory> + <includes> + <include>*.jar</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> diff --git a/pomba/network-discovery/src/main/docker/Dockerfile b/pomba/network-discovery/src/main/docker/Dockerfile new file mode 100644 index 0000000..a7f5782 --- /dev/null +++ b/pomba/network-discovery/src/main/docker/Dockerfile @@ -0,0 +1,22 @@ +FROM anapsix/alpine-java:jre8 + +ARG MICROSERVICE_HOME=/opt/app/ + +# Build up the deployment folder structure +RUN mkdir -p $MICROSERVICE_HOME +RUN mkdir -p $MICROSERVICE_HOME/config/ +RUN mkdir -p $MICROSERVICE_HOME/config/auth/ +RUN mkdir -p $MICROSERVICE_HOME/lib/ +RUN mkdir -p $MICROSERVICE_HOME/bin/ + +ADD pomba-network-discovery.jar $MICROSERVICE_HOME/lib/ +ADD startService.sh $MICROSERVICE_HOME/bin/ +COPY config/ $MICROSERVICE_HOME/config/ +COPY config/auth/ $MICROSERVICE_HOME/config/auth/ + +RUN chmod 755 $MICROSERVICE_HOME/config/* +RUN chmod 755 $MICROSERVICE_HOME/config/auth/* +RUN chmod 755 $MICROSERVICE_HOME/lib/* +RUN chmod 755 $MICROSERVICE_HOME/bin/* + +CMD ["/opt/app/bin/startService.sh"]
\ No newline at end of file diff --git a/pomba/network-discovery/src/main/docker/startService.sh b/pomba/network-discovery/src/main/docker/startService.sh new file mode 100644 index 0000000..2169c4d --- /dev/null +++ b/pomba/network-discovery/src/main/docker/startService.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +cd /opt/app +if [ -z "${java_runtime_arguments}" ]; then + java -Dlogging.config=config/logback.xml -Xms128m -Xmx512m -jar /opt/app/lib/pomba-network-discovery.jar +else + java -Dlogging.config=config/logback.xml $java_runtime_arguments -jar /opt/app/lib/pomba-network-discovery.jar +fi
\ No newline at end of file |