From e99da766007f594c4940b28e82d90531bc44c9f0 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 14 Feb 2019 13:52:48 -0500 Subject: Fix docker tags Update docker tags to conform to ONAP project standards Change-Id: I348f9507e382931e6adfa224d30225f0fbe270bc Issue-ID: CCSDK-1059 Signed-off-by: Timoney, Dan (dt5972) --- ms/blueprintsprocessor/distribution/pom.xml | 78 +++++++++++++---------------- 1 file changed, 34 insertions(+), 44 deletions(-) diff --git a/ms/blueprintsprocessor/distribution/pom.xml b/ms/blueprintsprocessor/distribution/pom.xml index fb5e3c128..b3eabc109 100755 --- a/ms/blueprintsprocessor/distribution/pom.xml +++ b/ms/blueprintsprocessor/distribution/pom.xml @@ -14,7 +14,9 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.onap.ccsdk.apps.blueprintsprocessor @@ -33,6 +35,8 @@ ${https_proxy} deploy true + ${project.version} + ${maven.build.timestamp} @@ -77,7 +81,8 @@ package - + @@ -91,7 +96,7 @@ maven-assembly-plugin 3.1.0 - + ${basedir}/target/docker-stage src/main/docker/distribution.xml @@ -119,22 +124,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}/../../../TagVersion.groovy @@ -147,30 +137,30 @@ docker - - - io.fabric8 - docker-maven-plugin - 0.26.1 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - true - - + + + io.fabric8 + docker-maven-plugin + 0.26.1 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + true + + generate-images package @@ -193,4 +183,4 @@ - \ No newline at end of file + -- cgit 1.2.3-korg