diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-05-01 12:15:37 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-05-01 12:15:45 -0700 |
| commit | a5952548db86e7de1fd95b5d0ca92a4387a533e4 (patch) | |
| tree | eb42df71c8b46c4afbd373ba5fb9647fcb75de12 /installation | |
| parent | b612744f3964c92f45ccc9407b731a6722af6df2 (diff) | |
Correcting jenkins build errors and docker tagsrelease-1.0.0
Change-Id: I55faadad61dc78e069443ea859a83409758e2b9b
Signed-off-by: Patrick Brady <pb071s@att.com>
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/appc/pom.xml | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml index 317273d..e46f1d7 100644 --- a/installation/appc/pom.xml +++ b/installation/appc/pom.xml @@ -192,6 +192,40 @@ <build> <plugins> <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <properties> + <ver>${project.version}</ver> + <timestamp>${maven.build.timestamp}</timestamp> + </properties> + <source> + println project.properties['ver']; + def versionArray; + if ( project.properties['ver'] != null ) { + versionArray = project.properties['ver'].split('\\.'); + } + if ( project.properties['ver'].endsWith("-SNAPSHOT") ) { + project.properties['dockertag1']=project.properties['ver'] + "-latest"; + project.properties['dockertag2']="latest"; + } else { + project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp']; + } + println 'docker tag 1: ' + project.properties['dockertag1']; + println 'docker tag 2: ' + project.properties['dockertag2']; + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>0.16.5</version> @@ -205,8 +239,7 @@ <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> <tags> - <!-- <tag>${appc.docker.staging.version}-STAGING-${maven.build.timestamp}</tag> --> - <tag>${release_name}.${sprint_number}-STAGING-latest</tag> + <tag>${dockertag1}</tag> </tags> </build> </image> |