From b83fec4d4fcb3086f2886e3424ea2db232aecdfd Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 12 Feb 2019 14:35:10 -0500 Subject: [PATCH] Fix docker tags Updated docker tags to conform to ONAP standards Change-Id: I489f6c6ce9ecdad973e72f3887825ea3ede317ae Issue-ID: CCSDK-1059 Signed-off-by: Timoney, Dan (dt5972) --- ansible-server/pom.xml | 24 +-- ansible-server/src/main/docker/Dockerfile | 2 +- dgbuilder-docker/pom.xml | 209 ++++++++++++------------- dgbuilder-docker/src/main/docker/Dockerfile | 2 +- odlsli/pom.xml | 24 +-- odlsli/src/main/docker/Dockerfile | 2 +- opendaylight/oxygen/pom.xml | 24 +-- opendaylight/oxygen/src/main/docker/Dockerfile | 2 +- src/main/scripts/TagVersion.groovy | 41 +++++ ubuntu/pom.xml | 26 +-- 10 files changed, 164 insertions(+), 192 deletions(-) create mode 100644 src/main/scripts/TagVersion.groovy diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 875437c0..ba141cb1 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -19,6 +19,7 @@ onap/ccsdk-ansible-server-image ${project.version} + ${maven.build.timestamp} ${project.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -37,22 +38,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 @@ -193,9 +179,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/ansible-server/src/main/docker/Dockerfile b/ansible-server/src/main/docker/Dockerfile index 68adaeb0..bebd8e00 100644 --- a/ansible-server/src/main/docker/Dockerfile +++ b/ansible-server/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:${project.docker.latestfulltag.version} LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 398f6544..582c638f 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -22,43 +24,28 @@ onap/ccsdk-dgbuilder-image ${project.version} + ${maven.build.timestamp} - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - 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']; - - - - - + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../src/main/scripts/TagVersion.groovy + + + + maven-resources-plugin 2.6 @@ -90,35 +77,35 @@ exec-maven-plugin 1.5.0 - - Make-stage-dir - generate-sources - - exec - - - /bin/mkdir - - -p - ${basedir}/target/docker-stage/opt/onap/ccsdk - - - - - Unzip dgbuilder - generate-sources - - exec - - - /usr/bin/unzip - - -d - ${basedir}/target/docker-stage/opt/onap/ccsdk - ../dgbuilder/target/*.zip - - - + + Make-stage-dir + generate-sources + + exec + + + /bin/mkdir + + -p + ${basedir}/target/docker-stage/opt/onap/ccsdk + + + + + Unzip dgbuilder + generate-sources + + exec + + + /usr/bin/unzip + + -d + ${basedir}/target/docker-stage/opt/onap/ccsdk + ../dgbuilder/target/*.zip + + + Copy dgbuilder generate-sources @@ -154,7 +141,7 @@ change shell permissions - process-sources + process-sources exec @@ -175,57 +162,57 @@ - + - - docker - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - generate-images - package - - build - - + + + ${image.name} + + try + ${basedir}/target/docker-stage + ${basedir}/target/docker-stage/Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + + + generate-images + package + + build + + - - push-images - deploy - - build - push - - - - - - - - + + push-images + deploy + + build + push + + + + + + + + diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile index 675e37a6..90ade01f 100644 --- a/dgbuilder-docker/src/main/docker/Dockerfile +++ b/dgbuilder-docker/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${project.version} +FROM onap/ccsdk-ubuntu-image:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-discuss@lists.onap.org) # copy onap 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 @@ onap/ccsdk-odlsli-image ${project.version} + ${maven.build.timestamp} 0.3.3 ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -242,22 +243,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 @@ -497,9 +483,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/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 diff --git a/opendaylight/oxygen/pom.xml b/opendaylight/oxygen/pom.xml index 62ffa496..ed0bebca 100644 --- a/opendaylight/oxygen/pom.xml +++ b/opendaylight/oxygen/pom.xml @@ -21,6 +21,7 @@ onap/ccsdk-odl-oxygen-image ${project.version} + ${maven.build.timestamp} 0.8.3 2.1.1 ${https_proxy} @@ -58,22 +59,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 @@ -185,9 +171,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/opendaylight/oxygen/src/main/docker/Dockerfile b/opendaylight/oxygen/src/main/docker/Dockerfile index 93811de9..9c9fec0f 100644 --- a/opendaylight/oxygen/src/main/docker/Dockerfile +++ b/opendaylight/oxygen/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${project.version} +FROM onap/ccsdk-ubuntu-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/current diff --git a/src/main/scripts/TagVersion.groovy b/src/main/scripts/TagVersion.groovy new file mode 100644 index 00000000..68a8b780 --- /dev/null +++ b/src/main/scripts/TagVersion.groovy @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CCSDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.ccsdk.distribution + + +def versionArray; +if ( project.properties['ccsdk.project.version'] != null ) { + versionArray = project.properties['ccsdk.project.version'].split('\\.'); +} + +if ( project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT") ) { + patchArray = versionArray[2].split('-'); + project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; + project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; +} else { + project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['ccsdk.build.timestamp']; +} diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 4a000bfb..cdd79657 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -21,6 +21,8 @@ onap/ccsdk-ubuntu-image ${project.version} + ${maven.build.timestamp} + ${project.version} @@ -36,23 +38,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 @@ -106,9 +92,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} -- 2.16.6