From b7d0c7d286fc254ae43f0ceec9f1873c6fdee0ac Mon Sep 17 00:00:00 2001 From: "Chinthakayala, Sheshashailavas (sc2914)" Date: Mon, 28 Aug 2017 09:00:36 -0900 Subject: [PATCH] [CCSDK-29]changes for dgbuilder docker image changes related to creating docker container for dgbuilder Change-Id: Ida8710be20c6737c46f7f01bc36e0fe11dd250bb Issue-ID:{CCSDK-29} Signed-off-by: Chinthakayala, Sheshashailavas (sc2914) --- dgbuilder-docker/flowShareUsers.js | 8 + dgbuilder-docker/pom.xml | 232 +++++++++++++++++++++ .../releases/1702/conf/svclogic.properties | 5 + dgbuilder-docker/releases/1702/customSettings.js | 20 ++ dgbuilder-docker/src/main/docker/Dockerfile | 13 ++ dgbuilder/pom.xml | 4 +- pom.xml | 1 + 7 files changed, 281 insertions(+), 2 deletions(-) create mode 100644 dgbuilder-docker/flowShareUsers.js create mode 100644 dgbuilder-docker/pom.xml create mode 100644 dgbuilder-docker/releases/1702/conf/svclogic.properties create mode 100644 dgbuilder-docker/releases/1702/customSettings.js create mode 100644 dgbuilder-docker/src/main/docker/Dockerfile diff --git a/dgbuilder-docker/flowShareUsers.js b/dgbuilder-docker/flowShareUsers.js new file mode 100644 index 00000000..4cbf7390 --- /dev/null +++ b/dgbuilder-docker/flowShareUsers.js @@ -0,0 +1,8 @@ +module.exports = {"flowShareUsers": + [ + { + "name" : "Release 1702", + "rootDir" : "1702" + } + ] +} diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml new file mode 100644 index 00000000..4e724611 --- /dev/null +++ b/dgbuilder-docker/pom.xml @@ -0,0 +1,232 @@ + + + + + org.onap.ccsdk.distribution + distribution-root + 0.1.0-SNAPSHOT + + + 4.0.0 + pom + org.onap.ccsdk.distribution + distribution-dgbuilder-docker + 0.1.0-SNAPSHOT + + Distribution - dgbuilder-docker + Creates docker container for dgbuilder + + + onap/ccsdk-dgbuilder-image + ${project.version} + + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + + println project.properties['ccsdk.project.version']; + def versionArray; + if ( project.properties['ccsdk.project.version'] != null ) { + 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"; + } else { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } + + println 'New Tag for docker:' + + project.properties['project.docker.latesttag.version']; + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + + + Make-stage-dir + generate-sources + + exec + + + /bin/mkdir + + -p + ${basedir}/target/docker-stage/opt/onap/sdnc + + + + + Unzip dgbuilder + generate-sources + + exec + + + /usr/bin/unzip + + -d + ${basedir}/target/docker-stage/opt/onap/sdnc + ../dgbuilder/target/*.zip + + + + + Copy dgbuilder + generate-sources + + exec + + + /bin/cp + + -r + ../dgbuilder + ${basedir}/target/docker-stage/opt/onap/sdnc + + + + + + dgbuilder createReleaseDir + generate-sources + + exec + + + /bin/bash + + ${basedir}/target/docker-stage/opt/onap/sdnc/dgbuilder/createReleaseDir.sh + 1702 + dguser + change_email_id@dgbuilder.com + + + + + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/opt/onap/sdnc + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + + ${image.name} + + try + ${basedir}/target/docker-stage + ${basedir}/target/docker-stage/Dockerfile + + ${project.version} + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + + + + generate-images + package + + build + + + + + push-images + deploy + + build + push + + + + + + + + + + ONAP + + diff --git a/dgbuilder-docker/releases/1702/conf/svclogic.properties b/dgbuilder-docker/releases/1702/conf/svclogic.properties new file mode 100644 index 00000000..92d997f1 --- /dev/null +++ b/dgbuilder-docker/releases/1702/conf/svclogic.properties @@ -0,0 +1,5 @@ +org.onap.ccsdk.sli.dbtype=jdbc +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma diff --git a/dgbuilder-docker/releases/1702/customSettings.js b/dgbuilder-docker/releases/1702/customSettings.js new file mode 100644 index 00000000..b67d0917 --- /dev/null +++ b/dgbuilder-docker/releases/1702/customSettings.js @@ -0,0 +1,20 @@ +module.exports = { + 'name' : 'Release 1702', + 'emailAddress' :'change_email_id@dgbuilder.com', + 'uiPort' :3100, + 'mqttReconnectTime': 15000, + 'serialReconnectTime' : 15000, + 'debugMaxLength': 1000, + 'htmlPath': 'releases/1702/html/', + 'xmlPath': 'releases/1702/xml/', + 'flowFile' : 'releases/1702/flows/flows.json', + 'sharedDir': 'releases/1702/flows/shared', + 'userDir' : 'releases/1702', + 'httpAuth': {user:'dguser',pass:'cc03e747a6afbbcbf8be7668acfebee5'}, + 'dbHost': 'dbhost', + 'dbPort': '3306', + 'dbName': 'sdnctl', + 'dbUser': 'sdnctl', + 'dbPassword': 'gamma', + 'gitLocalRepository': '' + } diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile new file mode 100644 index 00000000..bb6e274a --- /dev/null +++ b/dgbuilder-docker/src/main/docker/Dockerfile @@ -0,0 +1,13 @@ +# Base ubuntu with added packages needed for open ecomp +FROM onap/ubuntu-sdnc-image:${project.version} +MAINTAINER SDN-C Team (sdnc@lists.onap.org) + +# copy onap +COPY opt /opt +WORKDIR /opt/onap/sdnc/dgbuilder +# Set the proxy if needed +# RUN npm config set proxy http://your.proxy.com:8080 +#RUN npm install + +#ENTRYPOINT /bin/bash /opt/onap/sdnc/dgbuilder/start sdnc1.0 +EXPOSE 3100 diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 88300310..e1cde5a0 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -11,11 +11,11 @@ 4.0.0 pom org.onap.ccsdk.distribution - dgbuilder + distribution-dgbuilder 0.1.0-SNAPSHOT - Directed Graph Builder + Distribution - dgbuilder Directed Graph Builder diff --git a/pom.xml b/pom.xml index 525f2316..3fc87322 100644 --- a/pom.xml +++ b/pom.xml @@ -32,5 +32,6 @@ opendaylight odlsli dgbuilder + dgbuilder-docker -- 2.16.6