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
-# Base ubuntu with added packages needed for open ecomp
+# Base alpine with added packages needed for open ecomp
FROM alpine:3.8
MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
FROM alpine:3.8
MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
ENV https_proxy ${HTTPS_PROXY}
# Add tools needed for OpenDaylight
ENV https_proxy ${HTTPS_PROXY}
# Add tools needed for OpenDaylight
-RUN apk update && apk --no-cache add bash git openjdk8 maven mysql-client nodejs py-pip graphviz unzip rsync nss
+RUN apk update && apk --no-cache add bash git openjdk8 maven mysql-client nodejs python3 graphviz unzip rsync nss
RUN apk add --no-cache curl \
iputils \
bash \
RUN apk add --no-cache curl \
iputils \
bash \
openssh-client \
python3 &&\
apk add --no-cache --virtual .build-deps build-base \
openssh-client \
python3 &&\
apk add --no-cache --virtual .build-deps build-base \
#print pretty_xml_as_string
x = etree.parse(xml_fname)
#print pretty_xml_as_string
x = etree.parse(xml_fname)
-print etree.tostring(x, pretty_print = True)
+print(etree.tostring(x, pretty_print = True))
if [ "$#" != "1" ]
then
echo "Usage: $0 jsonFileFullPath"
exit
fi
if [ "$#" != "1" ]
then
echo "Usage: $0 jsonFileFullPath"
exit
fi
-cat $1|python -m json.tool
+python3 -m json.tool "$1"
if [ "$#" != "1" ]
then
echo "Usage: $0 xmlFileFullPath"
if [ "$#" != "1" ]
then
echo "Usage: $0 xmlFileFullPath"
- python $PROJECT_HOME/tools/formatXml.py $1
+ python3 $PROJECT_HOME/tools/formatXml.py "$1"
- echo "File $1 does not exist"
+ echo "File $1 does not exist"
echo "module.exports = {"
echo "\"moduleName\" : \"${module}\","
echo "'${module}_VALUES' : "
echo "module.exports = {"
echo "\"moduleName\" : \"${module}\","
echo "'${module}_VALUES' : "
-echo "[ $allProps ]"|python -m json.tool
+echo "[ $allProps ]"|python3 -m json.tool
echo ","
echo "'${module}_RPCS' : ["
echo ","
echo "'${module}_RPCS' : ["
-# 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
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 \
# copy the opendaylight tar and expand
COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
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
&& 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}
# workaround till we get proxy working
RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
end=$(date +%s.%N)
echo "Load and activate finished at $(date)"
end=$(date +%s.%N)
echo "Load and activate finished at $(date)"
-runtime=$(python -c "print(${end} - ${start})")
+runtime=$(python3 -c "print(${end} - ${start})")
echo "Load and activate took $runtime seconds"
echo "Load and activate took $runtime seconds"
if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
# Add tools needed for OpenDaylight
if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
# Add tools needed for OpenDaylight
-RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python-pip graphviz npm unzip
+RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python3-pip graphviz npm unzip