From 4083ef5710e8851cd505dc264469c7342126d093 Mon Sep 17 00:00:00 2001 From: Mohammadreza Pasandideh Date: Wed, 15 Aug 2018 15:41:22 -0400 Subject: Docker file: networkDiscovery serviceDecomposition Issue-ID: LOG-397 SDNC-317 Change-Id: I80171ad4332e70872e5d3d8c42625f8669aa4d99 Signed-off-by: Mohammadreza Pasandideh --- pomba/network-discovery/pom.xml | 235 +++++++++++++++++---- pomba/network-discovery/src/main/docker/Dockerfile | 22 ++ .../src/main/docker/startService.sh | 8 + pomba/service-decomposition/pom.xml | 231 +++++++++++++++++--- .../src/main/docker/Dockerfile | 19 ++ .../src/main/docker/startService.sh | 8 + 6 files changed, 448 insertions(+), 75 deletions(-) create mode 100644 pomba/network-discovery/src/main/docker/Dockerfile create mode 100644 pomba/network-discovery/src/main/docker/startService.sh create mode 100644 pomba/service-decomposition/src/main/docker/Dockerfile create mode 100644 pomba/service-decomposition/src/main/docker/startService.sh (limited to 'pomba') 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. UTF-8 ${project.build.directory}/generated-resources/swagger + + ${project.version}-${timestamp} + ${project.version}-latest @@ -134,47 +137,8 @@ limitations under the License. - network-discovery + ${project.artifactId} - - com.github.kongchen - swagger-maven-plugin - 3.1.7 - - - - - org.onap.sdnc.apps.pomba.networkdiscovery.service.rs - - /network-discovery - - Network Discovery API - ${project.version} - http://onap.org - - Sharon Chisholm - sharon.chisholm@amdocs.com - - - - - basicAuth - basic - - - ${swagger.directory} - - - - - - compile - - generate - - - - maven-resources-plugin 3.1.0 @@ -210,8 +174,7 @@ limitations under the License. - + src/main/resources @@ -222,4 +185,192 @@ limitations under the License. + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.19.1 + + true + 1.23 + + + onap/${project.artifactId} + ${project.artifactId} + + try + ${project.basedir}/target/docker-stage + + ${docker.snapshot.tag} + ${docker.latest.tag} + + + + + + + + generate-images + generate-sources + + build + + + + push-images + deploy + + build + push + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.7 + + + + + org.onap.sdnc.apps.pomba.networkdiscovery.service.rs + + /network-discovery + + Network Discovery API + ${project.version} + http://onap.org + + + + basicAuth + basic + + + ${swagger.directory} + + + + + + compile + + generate + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + package + + ${project.basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + copy-properties + + copy-resources + + package + + ${project.basedir}/target/docker-stage/config + + + config + + *.properties + *.xml + + false + + + + + + copy-certificate + + copy-resources + + package + + ${project.basedir}/target/docker-stage/config/auth + + + auth + + *.p12 + + false + + + + + + copy-script + + copy-resources + + package + + ${project.basedir}/target/docker-stage/ + + + src/main/docker + + *.sh + + false + + + + + + copy-jar + + copy-resources + + package + + ${project.basedir}/target/docker-stage/ + + + target + + *.jar + + false + + + + + + + + + + + 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 diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml index 6252246..39ebf3d 100644 --- a/pomba/service-decomposition/pom.xml +++ b/pomba/service-decomposition/pom.xml @@ -1,4 +1,21 @@ + 4.0.0 @@ -16,6 +33,9 @@ UTF-8 ${project.build.directory}/generated-resources/swagger service-decomposition + + ${project.version}-${timestamp} + ${project.version}-latest @@ -120,40 +140,8 @@ - service-decomposition + ${project.artifactId} - - com.github.kongchen - swagger-maven-plugin - 3.1.3 - - - - org.onap.sdnc.apps.pomba.servicedecomposition.service.rs - /service-decomposition - - ${project.artifactId} Service - ${project.version} - - - - basicAuth - basic - - - ${swagger.directory} - - - - - - compile - - generate - - - - maven-resources-plugin 3.1.0 @@ -189,5 +177,182 @@ + + + + src/main/resources + true + + **/* + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.19.1 + + true + 1.23 + + + onap/${project.artifactId} + ${project.artifactId} + + try + ${project.basedir}/target/docker-stage + + ${docker.snapshot.tag} + ${docker.latest.tag} + + + + + + + + generate-images + generate-sources + + build + + + + push-images + deploy + + build + push + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.3 + + + + org.onap.sdnc.apps.pomba.servicedecomposition.service.rs + /service-decomposition + + Service Decomposition API + ${project.version} + http://onap.org + + + + basicAuth + basic + + + ${swagger.directory} + + + + + + compile + + generate + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + package + + ${project.basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + copy-properties + + copy-resources + + package + + ${project.basedir}/target/docker-stage/config + + + config + + *.properties + *.xml + + false + + + + + + copy-script + + copy-resources + + package + + ${project.basedir}/target/docker-stage/ + + + src/main/docker + + *.sh + + false + + + + + + copy-jar + + copy-resources + + package + + ${project.basedir}/target/docker-stage/ + + + target + + *.jar + + false + + + + + + + + + + + diff --git a/pomba/service-decomposition/src/main/docker/Dockerfile b/pomba/service-decomposition/src/main/docker/Dockerfile new file mode 100644 index 0000000..55a7b68 --- /dev/null +++ b/pomba/service-decomposition/src/main/docker/Dockerfile @@ -0,0 +1,19 @@ +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/lib/ +RUN mkdir -p $MICROSERVICE_HOME/bin/ + +ADD pomba-service-decomposition.jar $MICROSERVICE_HOME/lib/ +ADD startService.sh $MICROSERVICE_HOME/bin/ +COPY config/ $MICROSERVICE_HOME/config/ + +RUN chmod 755 $MICROSERVICE_HOME/config/* +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/service-decomposition/src/main/docker/startService.sh b/pomba/service-decomposition/src/main/docker/startService.sh new file mode 100644 index 0000000..5efbe79 --- /dev/null +++ b/pomba/service-decomposition/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-service-decomposition.jar +else + java -Dlogging.config=config/logback.xml $java_runtime_arguments -jar /opt/app/lib/pomba-service-decomposition.jar +fi \ No newline at end of file -- cgit 1.2.3-korg