Update distribution scripts to python3

[ccsdk/distribution.git] / opendaylight / neon / neon-alpine / src / main / docker / Dockerfile

diff --git a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
index a043e1e..9d518af 100644 (file)
--- a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
@@ -1,18 +1,19 @@
-# 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}