diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-01 13:47:32 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-01 13:47:32 -0400 |
| commit | 2951652d185277ccbf36e7b53df014b895889b71 (patch) | |
| tree | 886cd8c5b6d21edcdee175001278c1834ebf7f0d /opendaylight/neon/neon-docker/src/main/docker | |
| parent | 707c6a1ab19a63dcbf375bf7c1ee503ea69ac5f0 (diff) | |
Roll back to using ODL tarball
Roll back to using ODL Neon tarball until finished debugging issues
with custom ODL karaf distribution
Change-Id: Iad014537c15805e32832e2cbcee4813d661ae1fe
Issue-ID: CCSDK-1753
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'opendaylight/neon/neon-docker/src/main/docker')
| -rw-r--r-- | opendaylight/neon/neon-docker/src/main/docker/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/opendaylight/neon/neon-docker/src/main/docker/Dockerfile b/opendaylight/neon/neon-docker/src/main/docker/Dockerfile index 5b5f3774..a043e1e9 100644 --- a/opendaylight/neon/neon-docker/src/main/docker/Dockerfile +++ b/opendaylight/neon/neon-docker/src/main/docker/Dockerfile @@ -5,11 +5,11 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV ODL_HOME /opt/opendaylight/current # copy the opendaylight tar and expand -COPY odl-neon-karaf-${project.version}.tar.gz /tmp/ +COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/ RUN mkdir -p /opt/odl \ - && tar zxvf /tmp/odl-neon-karaf-${project.version}.tar.gz --directory /opt/odl \ - && rm -rf /tmp/odl-neon-karaf-${project.version}.tar.gz \ - && mv /opt/odl/odl-neon-karaf-${project.version} /opt/opendaylight \ + && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \ + && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \ + && mv /opt/odl/karaf-${ccsdk.opendaylight.version} /opt/opendaylight \ && ln -s /opt/opendaylight /opt/opendaylight/karaf-${ccsdk.opendaylight.version} \ && ln -s /opt/opendaylight /opt/opendaylight/current |