summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToine Siebelink <toine.siebelink@est.tech>2021-01-27 17:37:00 +0000
committerGerrit Code Review <gerrit@onap.org>2021-01-27 17:37:00 +0000
commitb4164f104d61bcaff8d84d65b8a9fffcd3280dce (patch)
tree2b4853225a6d7e99c943cbd7561e3431ada19913
parenta54fd8a169e8e6ef74bdc06be78bbcd70d5f97b4 (diff)
parent1e5bd9498bd22e1bda74f0382bca3186e82ce811 (diff)
Merge "Docker image building and docker-compose for cps-nf-proxy"
-rwxr-xr-xcps-nf-proxy-rest/pom.xml36
-rw-r--r--docker-compose/docker-compose.yml13
2 files changed, 49 insertions, 0 deletions
diff --git a/cps-nf-proxy-rest/pom.xml b/cps-nf-proxy-rest/pom.xml
index 23adb93355..7b56014353 100755
--- a/cps-nf-proxy-rest/pom.xml
+++ b/cps-nf-proxy-rest/pom.xml
@@ -12,6 +12,8 @@
<artifactId>cps-nf-proxy-rest</artifactId>
<properties>
+ <app>org.onap.cps.nfproxy.Application</app>
+ <repository.name>nexus3.onap.org:10001/onap/cps-nf-proxy</repository.name>
<minimum-coverage>0.44</minimum-coverage>
</properties>
@@ -116,4 +118,38 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <id>build</id>
+ <goals>
+ <goal>dockerBuild</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>deploy</phase>
+ <id>buildAndPush</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b1b3bf9255..391d91109e 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -14,6 +14,19 @@ services:
depends_on:
- dbpostgresql
+ cps-nf-proxy:
+ container_name: cps-nf-proxy
+ image: nexus3.onap.org:10001/onap/cps-nf-proxy:${VERSION}
+ ports:
+ - "8081:8080"
+ environment:
+ DB_HOST: ${DB_HOST}
+ DB_USERNAME: ${DB_USERNAME}
+ DB_PASSWORD: ${DB_PASSWORD}
+ restart: unless-stopped
+ depends_on:
+ - dbpostgresql
+
dbpostgresql:
container_name: dbpostgresql
image: postgres