Update version to Guilin to enable gating testing

[externalapi/nbi.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 701827e..27c7810 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,32 +16,17 @@
 
 FROM registry.gitlab.com/onap-integration/docker/onap-java
 
-USER root
-COPY src/main/resources/certificate /certs
-ARG CERT_PASS=changeit
-RUN for cert in $(ls -d /certs/*); do \
-        echo "adding $cert to java keystore..."; \
-        keytool -import \
-                -file "$cert" \
-                -storepass "${CERT_PASS}" \
-                -keystore $JAVA_HOME/lib/security/cacerts \
-                -alias "$(basename $cert)" \
-                --noprompt; \
-    done
-
 USER onap
 
 ARG SERVER_PORT
-ARG PKG_FILENAME=nbi-rest-services-6.0.0-SNAPSHOT.jar
+ARG PKG_FILENAME=nbi-rest-services-7.0.0-SNAPSHOT.jar
 ADD target/$PKG_FILENAME /opt/onap/app.jar
 
 RUN mkdir temptoscafile && chown onap:onap temptoscafile/
 
 
-ENV SERVER_PORT=${SERVER_PORT:-8443}
-ENV HTTP_PORT=${HTTP_PORT:-8080}
-ENV JAVA_OPTS="-Dspring.profiles.active=ssl -Djava.security.egd=file:/dev/./urandom"
+ENV SERVER_PORT=${SERVER_PORT:-8080}
+ENV JAVA_OPTS=${JAVA_OPTS:--Djava.security.egd=file:/dev/./urandom}
 
 EXPOSE $SERVER_PORT
-EXPOSE $HTTP_PORT
-ENTRYPOINT java -XX:+UseContainerSupport $JAVA_OPTS -jar /opt/onap/app.jar
+ENTRYPOINT exec java -XX:+UseContainerSupport $JAVA_OPTS -jar /opt/onap/app.jar