summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogumil Zebek <bogumil.zebek@nokia.com>2020-02-11 18:13:31 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-11 18:13:31 +0000
commitab3855c97a649398d75e31e68528f9c82f0f9e4f (patch)
treecb1fb98de9e0cdde99fac86a80f205fe70b18801
parentbddd4f0e38e09fb8479e9f97313fdb41297c2990 (diff)
parentb9dabed7540f76a81609aaa48ec2c682870de53b (diff)
Merge "Adds docker profile to cert-service"
-rw-r--r--certService/pom.xml63
1 files changed, 56 insertions, 7 deletions
diff --git a/certService/pom.xml b/certService/pom.xml
index 38c356c4..d5b6e7d3 100644
--- a/certService/pom.xml
+++ b/certService/pom.xml
@@ -39,6 +39,7 @@
<springdoc-openapi-ui.version>1.2.21</springdoc-openapi-ui.version>
<bouncycastle.version>1.60</bouncycastle.version>
<docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+ <docker.tag>${project.version}</docker.tag>
</properties>
<dependencyManagement>
@@ -178,6 +179,14 @@
<profiles>
<profile>
+ <id>docker-staging</id>
+ <properties>
+ <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
+ <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
+ </properties>
+ </profile>
+
+ <profile>
<id>docker</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -190,27 +199,67 @@
<version>${docker-maven-plugin.version}</version>
<executions>
<execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
+ <id>clean-images</id>
+ <phase>pre-clean</phase>
+ <goals>
+ <goal>remove</goal>
+ </goals>
+ <configuration>
+ <removeAll>true</removeAll>
+ <image>onap/cert-service</image>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-images</id>
+ <phase>install</phase>
<goals>
<goal>build</goal>
- <goal>start</goal>
</goals>
</execution>
+<!-- It has to be published on nexus firstly to uncomment integration tests-->
+<!-- <execution>-->
+<!-- <id>start</id>-->
+<!-- <phase>pre-integration-test</phase>-->
+<!-- <goals>-->
+<!-- <goal>start</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- <execution>-->
+<!-- <id>stop</id>-->
+<!-- <phase>post-integration-test</phase>-->
+<!-- <goals>-->
+<!-- <goal>stop</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
<execution>
- <id>stop</id>
- <phase>post-integration-test</phase>
+ <id>push-images</id>
+ <phase>deploy</phase>
<goals>
- <goal>stop</goal>
+ <goal>push</goal>
</goals>
+ <configuration>
+ <image>onap/cert-service</image>
+ </configuration>
</execution>
</executions>
<configuration>
+ <apiVersion>1.23</apiVersion>
+ <registry>nexus3.onap.org:10001</registry>
+ <authConfig>
+ <pull>
+ <username>docker</username>
+ <password>docker</password>
+ </pull>
+ </authConfig>
<images>
<image>
- <name>cert-service</name>
+ <name>onap/cert-service</name>
+ <alias>cert-service</alias>
<build>
<dockerFile>${project.basedir}/Dockerfile</dockerFile >
+ <tags>
+ <tag>${docker.tag}</tag>
+ </tags>
</build>
<run>
<ports>