X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ansible-server%2Fpom.xml;h=46e1de441ad3424d618d494ffc1ac0c907c43646;hb=486bd1768c2b4e6bf4a83326fdc5f7d07d565222;hp=a8092026f99eccbb398882a1b53bfa6281a23c84;hpb=a5a96e3da7da19815497a72be4610ab929d25441;p=ccsdk%2Fdistribution.git diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index a8092026..46e1de44 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -1,35 +1,40 @@ - + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.2.1-SNAPSHOT + + org.onap.ccsdk.distribution + distribution-root + 1.2.0-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.distribution ansible-server - 0.4.1-SNAPSHOT + 1.2.0-SNAPSHOT + pom - ccsdk :: distribution :: ${project.artifactId} + ccsdk-distribution :: ${project.artifactId} Creates ansible-server Docker container + + ONAP + onap/ccsdk-ansible-server-image - ${project.version} - ${project.version} - yyyyMMdd'T'HHmmss'Z' - true + ${project.version} + ${maven.build.timestamp} + ${project.version} + yyyyMMdd'T'HHmmss'Z' + true + false - org.codehaus.groovy.maven gmaven-plugin + 1.0 validate @@ -37,22 +42,7 @@ 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']; - + ${basedir}/../src/main/scripts/TagVersion.groovy @@ -85,8 +75,8 @@ - exec-maven-plugin org.codehaus.mojo + exec-maven-plugin 1.5.0 @@ -109,6 +99,26 @@ + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/ansible-server + -name + *.sh + -exec + chmod + +x + {} + ; + + + @@ -122,7 +132,7 @@ io.fabric8 docker-maven-plugin - 0.16.5 + 0.34.0 false @@ -130,29 +140,22 @@ ${image.name} try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile + ${basedir}/target/docker-stage + Dockerfile - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + ${docker.verbose} + ${docker.skip.push} - generate-images - package - - build - - - - - push-images - deploy + build-push-images build push @@ -164,7 +167,4 @@ - - ONAP -