Fix base docker version

[sdnc/oam.git] / installation / sdnc / src / main / docker / standalone.Dockerfile

diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index 67381f5..9814455 100755 (executable)
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -1,6 +1,6 @@
 # Prepare stage for multistage image build
 ## START OF STAGE0 ##
-FROM onap/ccsdk-odlsli-alpine-image:latest AS stage0
+FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} AS stage0
 
 USER root
 
@@ -14,7 +14,7 @@ COPY system /tmp/system
 RUN rsync -a /tmp/system $ODL_HOME
 ## END OF STAGE0 ##
 
-FROM onap/ccsdk-odlsli-alpine-image:latest
+FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
 
 LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
 
@@ -46,7 +46,9 @@ RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HO
 # Install ssl and java certificates
 COPY truststoreONAPall.jks $JAVA_SECURITY_DIR
 COPY truststoreONAPall.jks $SDNC_STORE_DIR
-RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit
+RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit -noprompt
+RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts  -deststorepass changeit -noprompt
+
 
 # Secure with TLS
 RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties