diff options
Diffstat (limited to 'opendaylight/neon/neon-docker')
| -rw-r--r-- | opendaylight/neon/neon-docker/pom.xml | 6 | ||||
| -rw-r--r-- | opendaylight/neon/neon-docker/src/main/docker/Dockerfile | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/opendaylight/neon/neon-docker/pom.xml b/opendaylight/neon/neon-docker/pom.xml index ec183454..c8228eec 100644 --- a/opendaylight/neon/neon-docker/pom.xml +++ b/opendaylight/neon/neon-docker/pom.xml @@ -57,9 +57,9 @@ <configuration> <artifactItems> <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>odl-neon-karaf</artifactId> - <version>${project.version}</version> + <groupId>org.opendaylight.integration</groupId> + <artifactId>karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> <type>tar.gz</type> <overWrite>true</overWrite> 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 |