X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dbc-client%2Fpom.xml;h=f5fa4af9386cf1af886bffb263a727bbc6fc3c09;hb=7a3fdbe253f2f4c7cf407d27fbd0bc990fdca817;hp=945eeee4d5d9889f0487587939a596ffca6aaaaf;hpb=d0a915d10c00314ecc1f07c2ecf9dd239ee47aad;p=dmaap%2Fbuscontroller.git
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 945eeee..f5fa4af 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -95,71 +95,168 @@
-
- docker
-
- false
- false
- true
-
-
-
-
- com.spotify
- docker-maven-plugin
- ${docker.maven.plugin.version}
-
- alpine:3.8
- ${onap.nexus.dockerregistry.daily}/${docker.image}
- ["./bin/dbc-client", "deploy"]
- ${onap.nexus.dockerregistry.daily}
- false
-
- ${artifact.version}
- latest
-
-
- /opt/app/dbc-client/log
-
- true
- root
-
+
+ docker
+
+ false
+ false
+ true
+
+
+
+
- /opt/app/dmaapbc/etc
- ${multiproject.basedir}/dbc-client
- version.properties
+ ${basedir}/target/docker-stage
+ ${basedir}/src/main/resources
+
+ Dockerfile
+
-
- /opt/app/dbc-client/misc
- ${multiproject.basedir}/misc
- cert-client-init.sh
+
+ ${basedir}/target/docker-stage/opt/app/dbc-client/etc
+ ${multiproject.basedir}/certs
+
+ org.onap.dmaap-bc.cred.props
+ org.onap.dmaap-bc.crontab.sh
+ org.onap.dmaap-bc.jks
+ org.onap.dmaap-bc.keyfile
+ org.onap.dmaap-bc.location.props
+ org.onap.dmaap-bc.p12
+ org.onap.dmaap-bc.props
+ org.onap.dmaap-bc.showpass
+ org.onap.dmaap-bc.trust.jks
+ ca.pem
+ client.pem
+ key.pem
+
-
- /opt/app/dbc-client/bin
- ${multiproject.basedir}/dbc-client/misc
- dbc-client
+
+
+ ${basedir}/target/docker-stage/opt/app/dbc-client/bin
+ ${basedir}/misc
+
+ dbc-client
+
+
+
+ ${basedir}/target/docker-stage/opt/app/dbc-client/etc
+ ${multiproject.basedir}
+
+ version.properties
+
+
+
+ ${basedir}/target/docker-stage/opt/app/dbc-client/misc
+ ${multiproject.basedir}/misc
+
+ cert-client-init.sh
+ aaf-ca.crt
+
-
- apk add --no-cache curl
- chmod +x /opt/app/dbc-client/misc/cert-client-init.sh
- chmod +x /opt/app/dbc-client/bin/*
- mkdir /opt/app/dbc-client/logs
-
- /opt/app/dbc-client
-
-
-
- default
-
- build
- push
-
-
-
-
-
-
+
+
+
+
+ maven-resources-plugin
+ 2.7
+
+
+ copy-jar
+ package
+
+ copy-resources
+
+
+ ${basedir}/target/docker-stage/opt/app/dmaapbc/lib
+
+
+ ${multiproject.basedir}/dbc-client/target
+
+ dbc-client.jar
+
+
+
+
+
+
+
+
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+ println 'ver: ' + project.properties['ver'];
+ if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+ project.properties['dockertag1']=project.properties['ver'] + "-latest";
+ project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
+ } else {
+ project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
+ project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+ }
+ println 'docker tag 1: ' + project.properties['dockertag1'];
+ println 'docker tag 2: ' + project.properties['dockertag2'];
+
+
+
+
+
+
+
+ io.fabric8
+ docker-maven-plugin
+ 0.28.0
+
+ ${docker.verbose}
+ ${docker.apiVersion}
+ ${docker.pull.registry}
+ ${docker.push.registry}
+
+
+ ${docker.image}
+
+ try
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${dockertag1}
+ ${dockertag2}
+
+
+
+
+
+
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
+
+
+
@@ -173,7 +270,7 @@
9.4.12.RC2
1.0.0
1.5.19
- 1.0.2
+ 1.1.6
0.7.7.201606060606
3.2
@@ -192,6 +289,10 @@
/content/sites/site/org/onap/dmaap/dbc-client/${artifact.version}
+
+ ${maven.build.timestamp}
+ yyyyMMdd'T'HHmmss'Z'
+
Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning.