summaryrefslogtreecommitdiffstats
path: root/opendaylight/nitrogen/src/main
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-04-13 16:09:17 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-04-13 16:09:17 -0400
commit67c756046e620cb8017bbe87a8e07588fab45ecd (patch)
tree4ac4abd81b37ea92eb545464e46c097f5f417d53 /opendaylight/nitrogen/src/main
parentf52fd84595277a11c27f335ff88e967889528f99 (diff)
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) <dt5972@att.com>
Diffstat (limited to 'opendaylight/nitrogen/src/main')
-rw-r--r--opendaylight/nitrogen/src/main/docker/Dockerfile6
1 files changed, 3 insertions, 3 deletions
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}