aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorByung-Woo Jun <byung-woo.jun@est.tech>2021-02-17 14:46:23 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-17 14:46:23 +0000
commit1073f37d4136f5c7f75ab608830285726765f6e0 (patch)
treeef605fc803ef61c5793d3cff5fd589c0fbd82501 /packages
parent6747f5a3ab6a3f620f5fd5eabb7b71b5262036b0 (diff)
parent33eb534b43713e8a50f15f517830fe62363cd180 (diff)
Merge "Remove mso-nssmf-adapter from SO Issue-ID: SO-3535"
Diffstat (limited to 'packages')
-rw-r--r--packages/docker/pom.xml31
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter32
2 files changed, 1 insertions, 62 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 759890d86c..41e0761712 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -223,30 +223,6 @@
</build>
</image>
<image>
- <name>${docker.image.prefix}/nssmf-adapter</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFile>docker-files/Dockerfile.so-nssmf-adapter</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.adapters:mso-nssmf-adapter</include>
- </includes>
- <outputFileNameMapping>app.jar</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
- </inline>
- </assembly>
- </build>
- </image>
- <image>
<name>${docker.image.prefix}/so-oof-adapter</name>
<build>
<cleanup>try</cleanup>
@@ -469,7 +445,7 @@
<goal>push</goal>
</goals>
<configuration>
- <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}/so-simulator,${docker.image.prefix}/mso-nssmf-adapter,${docker.image.prefix}/so-oof-adapter,${docker.image.prefix}/so-etsi-nfvo-ns-lcm</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}/so-simulator,${docker.image.prefix}/so-oof-adapter,${docker.image.prefix}/so-etsi-nfvo-ns-lcm</image>
</configuration>
</execution>
</executions>
@@ -519,11 +495,6 @@
</dependency>
<dependency>
<groupId>org.onap.so.adapters</groupId>
- <artifactId>mso-nssmf-adapter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.so.adapters</groupId>
<artifactId>mso-oof-adapter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter b/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter
deleted file mode 100644
index 19368fb597..0000000000
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM onap/so/base-image:1.0
-
-ARG http_proxy
-ENV HTTP_PROXY=$http_proxy
-ENV http_proxy=$HTTP_PROXY
-ARG https_proxy
-ENV HTTPS_PROXY=$https_proxy
-ENV https_proxy=$HTTPS_PROXY
-
-USER root
-RUN mkdir -p /app/config
-RUN mkdir -p /app/certificates
-RUN mkdir -p /app/logs
-RUN mkdir -p /app/ca-certificates
-RUN apk update && apk add apache2-utils
-
-COPY maven/app.jar /app
-COPY configs/logging/logback-spring.xml /app
-COPY scripts/start-app.sh /app
-COPY scripts/wait-for.sh /app
-COPY ca-certificates/onap-ca.crt /app/ca-certificates/onap-ca.crt
-RUN chown -R so:so /app
-
-USER so
-# Springboot configuration (required)
-VOLUME /app/config
-
-# Root certificates (optional)
-VOLUME /app/ca-certificates
-
-WORKDIR /app
-ENTRYPOINT ["/app/start-app.sh"]