From 67c756046e620cb8017bbe87a8e07588fab45ecd Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 13 Apr 2018 16:09:17 -0400 Subject: Install host key Create a new script to install karaf host.key on ODL installation. Also, updated base ODL container to move ODL base distribution directory to /opt/opendaylight/current and create a symlink with the original name. This is done to allow OOM to support an external mount to /opt/opendaylight/current/daexim to preserve backups. Change-Id: I048b7d8002636dcd4ffbdff7242eb40d2a2787da Issue-ID: CCSDK-241 Signed-off-by: Timoney, Dan (dt5972) --- opendaylight/nitrogen/src/main/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'opendaylight') diff --git a/opendaylight/nitrogen/src/main/docker/Dockerfile b/opendaylight/nitrogen/src/main/docker/Dockerfile index 1f69017c..f5c2324c 100644 --- a/opendaylight/nitrogen/src/main/docker/Dockerfile +++ b/opendaylight/nitrogen/src/main/docker/Dockerfile @@ -1,6 +1,6 @@ # Base ubuntu with added packages needed for open ecomp FROM onap/ccsdk-ubuntu-image:${project.version} -MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org) +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight/current @@ -9,8 +9,8 @@ COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/ RUN mkdir /opt/opendaylight \ && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/opendaylight \ && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \ - && ln -s /opt/opendaylight/karaf-${ccsdk.opendaylight.version} /opt/opendaylight/current - + && mv /opt/opendaylight/karaf-${ccsdk.opendaylight.version} /opt/opendaylight/current \ + && ln -s /opt/opendaylight/current /opt/opendaylight/karaf-${ccsdk.opendaylight.version} # workaround till we get proxy working RUN mkdir -p /opt/opendaylight/current/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} -- cgit 1.2.3-korg