summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile10
-rw-r--r--pom.xml9
2 files changed, 11 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index 91eb03c..483c219 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,18 @@
FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine
+ARG JAR_FILE=*.jar
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
+RUN apk update && apk add apache2-utils
COPY target/${JAR_FILE} /app/app.jar
COPY configs/logging/logback-spring.xml /app
@@ -22,13 +20,11 @@ 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"]
+
diff --git a/pom.xml b/pom.xml
index 9c2c4d8..28392a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.so.adapters</groupId>
<artifactId>so-nssmf-adapter</artifactId>
@@ -48,6 +48,13 @@
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>