From 264a5c64ff32720457c3f9d835fafb38591df4f5 Mon Sep 17 00:00:00 2001 From: sebdet Date: Tue, 16 Jun 2020 12:10:00 +0200 Subject: [PATCH] Add tagging to docker Add tagging groovy script to docker images Issue-ID: SDC-3097 Signed-off-by: sebdet Change-Id: I4246a07fae11a4907d7d337fd882f074e36bc0b5 --- pom.xml | 38 +++++++++++++++++++++++++++++++++++++- sdc-workflow-designer-be/pom.xml | 4 +++- sdc-workflow-designer-init/pom.xml | 4 +++- sdc-workflow-designer-ui/pom.xml | 4 +++- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 33f56e87..775e2169 100644 --- a/pom.xml +++ b/pom.xml @@ -36,8 +36,11 @@ 2.17 1.8 1.8 + yyyyMMdd'T'HHmmss'Z' UTF-8 UTF-8 + ${project.version} + ${maven.build.timestamp} 1.3.0 true docker @@ -45,7 +48,6 @@ nexus3.onap.org:10001 https://nexus.onap.org /content/sites/site/org/onap/sdc/workflow/${project.version} - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml @@ -149,6 +151,40 @@ + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + true + + + docker-tags + validate + + execute + + + + println 'Docker Tagging Script:' + project.properties['sdc.project.version'] + '/' + project.properties['sdc.build.timestamp']; + def versionArray; + if ( project.properties['sdc.project.version'] != null ) { + versionArray = project.properties['sdc.project.version'].split('\\.'); + } + + if ( project.properties['sdc.project.version'].endsWith("-SNAPSHOT") ) { + project.properties.setProperty('project.docker.latesttag.version',versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"); + project.properties.setProperty('project.docker.latesttagtimestamp.version',versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-"+project.properties['sdc.build.timestamp']); + } else { + project.properties.setProperty('project.docker.latesttag.version',versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"); + project.properties.setProperty('project.docker.latesttagtimestamp.version',versionArray[0] + '.' + versionArray[1] + "-STAGING-"+project.properties['sdc.build.timestamp']); + } + + println 'New Tags for docker:' + project.properties['project.docker.latesttag.version'] + '/' + project.properties['project.docker.latesttagtimestamp.version']; + + + + + diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml index aedc9ef0..c06314e0 100644 --- a/sdc-workflow-designer-be/pom.xml +++ b/sdc-workflow-designer-be/pom.xml @@ -223,7 +223,9 @@ onap/sdc-workflow-backend - ${project.version} + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} ${project.basedir}/docker diff --git a/sdc-workflow-designer-init/pom.xml b/sdc-workflow-designer-init/pom.xml index 0a5b5a4a..240181d7 100644 --- a/sdc-workflow-designer-init/pom.xml +++ b/sdc-workflow-designer-init/pom.xml @@ -30,7 +30,9 @@ onap/sdc-workflow-init - ${project.version} + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} Dockerfile diff --git a/sdc-workflow-designer-ui/pom.xml b/sdc-workflow-designer-ui/pom.xml index 9c254e43..554d94b5 100644 --- a/sdc-workflow-designer-ui/pom.xml +++ b/sdc-workflow-designer-ui/pom.xml @@ -178,7 +178,9 @@ onap/sdc-workflow-frontend - ${project.version} + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} ${project.basedir}/docker -- 2.16.6