diff options
Diffstat (limited to 'installation/admportal')
| -rw-r--r-- | installation/admportal/pom.xml | 20 | ||||
| -rw-r--r-- | installation/admportal/src/main/docker/Dockerfile | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 1edf61ec..0b0959c3 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> @@ -20,7 +21,8 @@ <properties> <image.name>onap/admportal-sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + <ccsdk.docker.version>0.3-STAGING-latest</ccsdk.docker.version> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> @@ -41,18 +43,18 @@ println project.properties['sdnc.project.version']; def versionArray; if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); + versionArray = + project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + if (project.properties['sdnc.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"; + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } - println 'New Tag for docker:' + - project.properties['project.docker.latesttag.version']; + println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; </source> </configuration> </execution> diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile index fadb8120..abaa056f 100644 --- a/installation/admportal/src/main/docker/Dockerfile +++ b/installation/admportal/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) # create link for pm2 |