diff options
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 3565ff7a..550cd0cd 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER SDN-C Team (sdnc@lists.onap.org) #ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk -ENV ODL_HOME /opt/opendaylight/current +ENV ODL_HOME /opt/opendaylight 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 @@ -22,9 +22,6 @@ COPY truststoreONAPall.jks $SDNC_STORE_DIR 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 test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc @@ -35,9 +32,9 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system # Add SDNC repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg.1 -RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.1 | sed -e "\|featuresBoot=config|s|$|,sdnc-northbound-all|" > $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresBoot=config|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg -# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf +ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh EXPOSE 8181 |