summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Sakoto <bruno.sakoto@bell.ca>2021-02-23 17:32:09 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-23 17:32:09 +0000
commitf2ce686eeb0781afb6766034581d9508d3501d55 (patch)
tree76038c15621474854a52816785cb1d244675fa21
parent277382c32a419a77976dbc04c64ef73d99e0f24b (diff)
parent6e60380d855d4c88928a70514fc960636437a67a (diff)
Merge "Fix docker image generation when not profile is selected"
-rw-r--r--cps-application/pom.xml35
1 files changed, 29 insertions, 6 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 378b671015..8ea2db3840 100644
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -34,7 +34,6 @@
<properties>
<app>org.onap.cps.Application</app>
- <image.name>cps-service</image.name>
<image.version>${project.version}</image.version>
<jib-maven-plugin.version>2.6.0</jib-maven-plugin.version>
<minimum-coverage>0.0</minimum-coverage>
@@ -105,10 +104,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
<profiles>
@@ -117,12 +112,24 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+
+ <properties>
+ <image.name>cps-service</image.name>
+ </properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cps-rest</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>xnf-docker</id>
@@ -140,11 +147,19 @@
<artifactId>cps-nf-proxy-rest</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>cps-xnf-docker</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<properties>
@@ -161,6 +176,14 @@
<artifactId>cps-nf-proxy-rest</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project> \ No newline at end of file