summaryrefslogtreecommitdiffstats
path: root/opendaylight/neon
diff options
context:
space:
mode:
authorMiroslav Los <miroslav.los@pantheon.tech>2019-11-13 11:15:40 +0100
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 09:33:42 -0500
commitfc4bb348c8a8b4a5d5f77065b8ebbca16d6ce5b8 (patch)
treec4b37c969be7a4d644cd5d30c52fa1b085eea5d6 /opendaylight/neon
parent4ec03269604e3bd897207552127f94b4d1f30850 (diff)
Update distribution scripts to python3
Also use python3 packages in Dockerfiles. Make python2 also available for OpenDaylight until they migrate Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech> Issue-ID: CCSDK-1923 Change-Id: I3d4453ccbfe191c545ba574695387dd33c129e25
Diffstat (limited to 'opendaylight/neon')
-rw-r--r--opendaylight/neon/neon-alpine/src/main/docker/Dockerfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
index 950dba69..9d518af3 100644
--- a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
@@ -1,9 +1,11 @@
-# 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 ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
RUN mkdir -p /opt/odl \
@@ -12,7 +14,6 @@ RUN mkdir -p /opt/odl \
&& 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}