diff options
| author |   Claudio D. Gasparini <claudio.gasparini@pantheon.tech> | 2021-02-20 18:56:47 +0100 |
|---|---|---|
| committer | Claudio David Gasparini <claudio.gasparini@pantheon.tech> | 2021-02-20 18:00:13 +0000 |
| commit | 6e60380d855d4c88928a70514fc960636437a67a (patch) | |
| tree | 8484d7f9522a200c009df7e43266419310092fb3 | |
| parent | f6afc1727aa7e06754cb617b6e4964391eb72664 (diff) | |
Fix docker image generation when not profile is selected
- by use default profile (cps-xnf-docker)
- move jib-maven-plugin execution under each profile
Issue-ID: CPS-175
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
Change-Id: I418d63ae5423bcaf612f3f280e8f69df78cd899e
| -rw-r--r-- | cps-application/pom.xml | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml index e5b46f6a4f..685029b809 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 |