summaryrefslogtreecommitdiffstats
path: root/saltstack-server
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2020-12-17 14:37:06 -0500
committerSingal, Kapil (ks220y) <ks220y@att.com>2020-12-18 12:13:29 -0500
commitb6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2 (patch)
tree86a814c9117a651cd7146b3f6f9d74b10c582e56 /saltstack-server
parent110bb110a48b98a40dad33e80071e0a21386f11d (diff)
1) Adding docker.skip.push tag so that it can be used to skip docker push during verify job
2) Upgrading docker-maven-plugin to 0.34.0 and replacing dockerFileDir to contextDir 3) Refactoring execution section of docker-maven-plugin 4) Refactoring POM Names 5) Running mvn tidy:pom Issue-ID: CCSDK-3057 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I19b9e231e5288e1372a9b3ac89d263bbb2209186
Diffstat (limited to 'saltstack-server')
-rw-r--r--saltstack-server/pom.xml33
1 files changed, 11 insertions, 22 deletions
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index f0a59235..16a29610 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -9,16 +9,13 @@
</parent>
<artifactId>saltstack-server</artifactId>
- <version>1.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-distribution :: saltstack-server</name>
+ <name>ccsdk-distribution :: ${project.artifactId}</name>
<description>Creates base saltstack-server Docker container</description>
<properties>
<image.name>onap/ccsdk-saltstack-server-image</image.name>
- <ccsdk.project.version>${project.version}</ccsdk.project.version>
- <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
</properties>
<build>
@@ -27,6 +24,7 @@
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -34,7 +32,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>${basedir}/../src/main/scripts/TagVersion.groovy</source>
+ <source>${basedir}/../src/main/scripts/TagVersion.groovy</source>
</configuration>
</execution>
</executions>
@@ -76,38 +74,30 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.26.0</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
-
<images>
<image>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
+ <tag>${project.docker.latestminortag.version}</tag>
+ <tag>${project.docker.latestfulltag.version}</tag>
+ <tag>${project.docker.latesttagtimestamp.version}</tag>
</tags>
</build>
</image>
</images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>
@@ -115,7 +105,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</profile>