summaryrefslogtreecommitdiffstats
path: root/odlsli/odlsli-alpine
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-12 14:35:10 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-12 14:35:10 -0500
commit268c4ba118679fa90b973ac49660d8f83eb9575b (patch)
treea7a5d10e9cb9b5131508355965d7fc5ff3ccccea /odlsli/odlsli-alpine
parent8ba2cee45f88c64d096dbbb29e73741403f747d1 (diff)
Fix docker tags
Updated docker tags to conform to ONAP standards Change-Id: If461ee7ea99a1966e66a03a3a970d0acef835320 Issue-ID: CCSDK-1059 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlsli/odlsli-alpine')
-rw-r--r--odlsli/odlsli-alpine/pom.xml24
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile2
2 files changed, 6 insertions, 20 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 89207a96..58f71a9d 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -24,6 +24,7 @@
<base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name>
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
+ <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<ccsdk.features.version>${project.version}</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>
@@ -258,22 +259,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>
@@ -513,9 +499,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/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 47b12081..b9054670 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/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-1.8-openjdk
ENV ODL_HOME /opt/opendaylight