diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-12 14:35:10 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-12 15:57:27 -0500 |
| commit | b83fec4d4fcb3086f2886e3424ea2db232aecdfd (patch) | |
| tree | 5d48f5c76a50e929a175862004fb9b5da9ca65c9 /odlsli | |
| parent | dad8225dc0e6fa95dca5e02f6abb892a0a979ffe (diff) | |
Fix docker tags
Updated docker tags to conform to ONAP standards
Change-Id: I489f6c6ce9ecdad973e72f3887825ea3ede317ae
Issue-ID: CCSDK-1059
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/pom.xml | 24 | ||||
| -rw-r--r-- | odlsli/src/main/docker/Dockerfile | 2 |
2 files changed, 6 insertions, 20 deletions
diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 3e72e7b6..b6842b79 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -25,6 +25,7 @@ <properties> <image.name>onap/ccsdk-odlsli-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <ccsdk.features.version>0.3.3</ccsdk.features.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> @@ -242,22 +243,7 @@ <goal>execute</goal> </goals> <configuration> - <source> - 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']; - </source> + <source>${basedir}/../src/main/scripts/TagVersion.groovy</source> </configuration> </execution> </executions> @@ -497,9 +483,9 @@ <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> <tags> - <tag>${project.version}</tag> - <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.version}</tag> </tags> </build> </image> diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile index 8ba16f01..d9673bcf 100644 --- a/odlsli/src/main/docker/Dockerfile +++ b/odlsli/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-odl-oxygen-image:${project.version} +FROM onap/ccsdk-odl-oxygen-image:${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 |