From 268c4ba118679fa90b973ac49660d8f83eb9575b Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 12 Feb 2019 14:35:10 -0500 Subject: Fix docker tags Updated docker tags to conform to ONAP standards Change-Id: If461ee7ea99a1966e66a03a3a970d0acef835320 Issue-ID: CCSDK-1059 Signed-off-by: Timoney, Dan (dt5972) --- odlsli/odlsli-ubuntu/pom.xml | 24 +++++------------------- odlsli/odlsli-ubuntu/src/main/docker/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 20 deletions(-) (limited to 'odlsli/odlsli-ubuntu') diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index 488692c9..8b26b490 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -24,6 +24,7 @@ onap/ccsdk-odl-fluorine-ubuntu-image onap/ccsdk-odlsli-image ${project.version} + ${maven.build.timestamp} ${project.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -258,22 +259,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 @@ -513,9 +499,9 @@ ${basedir}/target/docker-stage ${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} diff --git a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile index 98f17e4b..d5460e4b 100644 --- a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile +++ b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM ${base.image.name}:${project.version} +FROM ${base.image.name}:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight -- cgit 1.2.3-korg