X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=opendaylight%2Fneon%2Fneon-alpine%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=054a44f7433fdf62490b13fe9ddaeab04e7a18f9;hb=refs%2Fchanges%2F60%2F100060%2F1;hp=a043e1e9eafdf9e76da255208e422f08771bfcd0;hpb=428403f72cd97df8bdded8dadb624cd01dde459a;p=ccsdk%2Fdistribution.git

diff --git a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
index a043e1e9..054a44f7 100644
--- a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
@@ -1,22 +1,20 @@
-# Base ubuntu with added packages needed for open ecomp
 FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.version}
 MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
 ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV ODL_HOME /opt/opendaylight/current
 
+# make python2 also available up until OpenDaylight migrates to python3
+RUN apk add --no-cache py2-pip
+
 # copy the opendaylight tar and expand
-COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/
+COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
 RUN mkdir -p /opt/odl \
-    && 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} \
+    && tar zxvf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
+    && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
+    && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
+    && ln -s  /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
     && ln -s /opt/opendaylight /opt/opendaylight/current
- 
 
-# workaround till we get proxy working
-RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
-COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
 
 # ENTRYPOINT exec /opt/opendaylight/bin/karaf
 EXPOSE 8181