Fix truststore installation

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

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
old mode 100644 (file)
new mode 100755 (executable)
index 37db15d..3cd107d
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -1,29 +1,31 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM openecomp/ubuntu-sdnc-image:${project.version}
+FROM onap/ccsdk-odlsli-image:${ccsdk.distribution.version}
 
-MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
+MAINTAINER SDN-C Team (sdnc@lists.onap.org)
 
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight/current
-ENV SDNC_CONFIG_DIR /opt/openecomp/sdnc/data/properties
+ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
+ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
+ENV SSL_CERTS_DIR /etc/ssl/certs
+ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
 
-# copy the opendaylight tar and expand
-COPY distribution-karaf-${sdnc.opendaylight.version}.tar.gz /tmp/
-RUN mkdir /opt/opendaylight \
-    && tar zxvf /tmp/distribution-karaf-${sdnc.opendaylight.version}.tar.gz --directory /opt/opendaylight \
-    && rm -rf /tmp/distribution-karaf-${sdnc.opendaylight.version}.tar.gz \
-    && ln -s /opt/opendaylight/distribution-karaf-${sdnc.opendaylight.version} /opt/opendaylight/current \
-    && mkdir /opt/openecomp
 
-COPY idmlight.db.mv.db /opt/opendaylight/current
+# imstall ssl and java certificates
+COPY AAF_RootCA.cer $SSL_CERTS_DIR
+COPY truststoreONAPall.jks $JAVA_SECURITY_DIR
+COPY AAF_RootCA.cer $SDNC_STORE_DIR
+COPY truststoreONAPall.jks $SDNC_STORE_DIR
 
-# copy openecomp
+RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit
+
+# Overlay ODL credential database with pre-staged credentials
+COPY idmlight.db.mv.db /opt/opendaylight/current/data
+
+# copy onap
 COPY opt /opt
-RUN ln -s /opt/openecomp/sdnc /opt/sdnc
+RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc
 
-# workaround till we get proxy working
-RUN mkdir -p /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version}
-COPY mysql-connector-java-${sdnc.mysql-connector-java.version}.jar /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version}
 
 # ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
 EXPOSE 8181