summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/docker/pom.xml58
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image2
-rw-r--r--packages/docker/src/main/docker/docker-files/scripts/start-app.sh4
3 files changed, 50 insertions, 14 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 49f6422f3f..88a5001f17 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -23,6 +23,8 @@
<docker.skip.push>false</docker.skip.push>
<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
<docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+ <docker.image.prefix>onap/so</docker.image.prefix>
+ <docker.push.phase>deploy</docker.push.phase>
</properties>
<build>
@@ -72,7 +74,7 @@
<images>
<image>
- <name>onap/so/base-image:1.0</name>
+ <name>${docker.image.prefix}/base-image:1.0</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -80,7 +82,7 @@
</build>
</image>
<image>
- <name>onap/so/vnfm-adapter</name>
+ <name>${docker.image.prefix}/vnfm-adapter</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -105,7 +107,7 @@
</build>
</image>
<image>
- <name>onap/so/catalog-db-adapter</name>
+ <name>${docker.image.prefix}/catalog-db-adapter</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -130,7 +132,7 @@
</build>
</image>
<image>
- <name>onap/so/request-db-adapter</name>
+ <name>${docker.image.prefix}/request-db-adapter</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -155,7 +157,7 @@
</build>
</image>
<image>
- <name>onap/so/sdnc-adapter</name>
+ <name>${docker.image.prefix}/sdnc-adapter</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -180,7 +182,7 @@
</build>
</image>
<image>
- <name>onap/so/openstack-adapter</name>
+ <name>${docker.image.prefix}/openstack-adapter</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -205,7 +207,7 @@
</build>
</image>
<image>
- <name>onap/so/vfc-adapter</name>
+ <name>${docker.image.prefix}/vfc-adapter</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -230,7 +232,7 @@
</build>
</image>
<image>
- <name>onap/so/sdc-controller</name>
+ <name>${docker.image.prefix}/sdc-controller</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -255,7 +257,7 @@
</build>
</image>
<image>
- <name>onap/so/bpmn-infra</name>
+ <name>${docker.image.prefix}/bpmn-infra</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -280,7 +282,7 @@
</build>
</image>
<image>
- <name>onap/so/api-handler-infra</name>
+ <name>${docker.image.prefix}/api-handler-infra</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -305,7 +307,7 @@
</build>
</image>
<image>
- <name>onap/so/so-monitoring</name>
+ <name>${docker.image.prefix}/so-monitoring</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -329,6 +331,31 @@
</assembly>
</build>
</image>
+ <image>
+ <name>${docker.image.prefix}/vnfm-simulator</name>
+ <build>
+ <cleanup>try</cleanup>
+ <dockerFileDir>docker-files</dockerFileDir>
+ <dockerFile>Dockerfile.so-app</dockerFile>
+ <tags>
+ <tag>${project.version}</tag>
+ <tag>${project.version}-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latesttag.version}</tag>
+ </tags>
+ <assembly>
+ <inline>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.onap.so.vnfm:vnfm-service</include>
+ </includes>
+ <outputFileNameMapping>app.jar</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+ </inline>
+ </assembly>
+ </build>
+ </image>
</images>
</configuration>
@@ -354,13 +381,13 @@
<execution>
<id>push-images</id>
- <phase>deploy</phase>
+ <phase>${docker.push.phase}</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
<configuration>
- <image>onap/so/catalog-db-adapter,onap/so/request-db-adapter,onap/so/sdnc-adapter,onap/so/openstack-adapter,onap/so/vfc-adapter,onap/so/sdc-controller,onap/so/bpmn-infra,onap/so/api-handler-infra,onap/so/so-monitoring</image>
+ <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring,${docker.image.prefix}/vnfm-simulator</image>
</configuration>
</execution>
</executions>
@@ -428,5 +455,10 @@
<artifactId>so-monitoring-service</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.onap.so.vnfm</groupId>
+ <artifactId>vnfm-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
index de446b734a..cf50868ca5 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
@@ -11,7 +11,7 @@ ENV https_proxy=$HTTPS_PROXY
RUN apk update && apk upgrade
# Install commonly needed tools
-RUN apk --no-cache add curl netcat-openbsd sudo
+RUN apk --no-cache add curl netcat-openbsd sudo nss
# Create 'so' user
RUN addgroup -g 1000 so && adduser -S -u 1000 -G so -s /bin/sh so
diff --git a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh
index cb5586d61d..cb2f35b87f 100644
--- a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh
+++ b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh
@@ -52,6 +52,10 @@ if [ ${APP} = "so-monitoring" ]; then
ln -s ${LOG_PATH} MONITORING
fi
+if [ ${APP} = "vnfm-simulator" ]; then
+ ln -s ${LOG_PATH} SIMULATOR
+fi
+
if [ ${APP} = "openstack-adapter" ]; then
export DISABLE_SNI="-Djsse.enableSNIExtension=false"
fi