From b46add8acac65c428c55d9fbea4c329cf17a9af8 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 12 Feb 2018 08:37:56 -0500 Subject: [PATCH] Fix karaf tarball name Karaf tarball name format is different in Nitrogen (karaf* instead of distribution-karaf*). Change-Id: I9f28c9f59ff89c061223d5f35dfa8e7df8d8c5b6 Issue-ID: CCSDK-179 Signed-off-by: Dan Timoney --- opendaylight/nitrogen/pom.xml | 2 +- opendaylight/nitrogen/src/main/docker/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opendaylight/nitrogen/pom.xml b/opendaylight/nitrogen/pom.xml index d8518865..b14b1603 100644 --- a/opendaylight/nitrogen/pom.xml +++ b/opendaylight/nitrogen/pom.xml @@ -217,6 +217,6 @@ - openECOMP + ONAP diff --git a/opendaylight/nitrogen/src/main/docker/Dockerfile b/opendaylight/nitrogen/src/main/docker/Dockerfile index 7e66a61a..1f69017c 100644 --- a/opendaylight/nitrogen/src/main/docker/Dockerfile +++ b/opendaylight/nitrogen/src/main/docker/Dockerfile @@ -7,9 +7,9 @@ ENV ODL_HOME /opt/opendaylight/current # copy the opendaylight tar and expand COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/ RUN mkdir /opt/opendaylight \ - && tar zxvf /tmp/distribution-karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/opendaylight \ - && rm -rf /tmp/distribution-karaf-${ccsdk.opendaylight.version}.tar.gz \ - && ln -s /opt/opendaylight/distribution-karaf-${ccsdk.opendaylight.version} /opt/opendaylight/current + && 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 # workaround till we get proxy working -- 2.16.6