Commit d62eb8c3 authored by Min RK's avatar Min RK Committed by GitHub

Merge pull request #349 from parente/bump-spylon-kernel

Fix #345: Move to Spark 2.1, spylon-kernel to 0.2
parents 72cca2a7 87ca3de0
...@@ -32,5 +32,5 @@ RUN pip --no-cache-dir install https://dist.apache.org/repos/dist/dev/incubator/ ...@@ -32,5 +32,5 @@ RUN pip --no-cache-dir install https://dist.apache.org/repos/dist/dev/incubator/
RUN jupyter toree install --sys-prefix RUN jupyter toree install --sys-prefix
# Spylon-kernel # Spylon-kernel
RUN pip --no-cache-dir install "spylon-kernel==0.1.2" RUN conda install --quiet --yes 'spylon-kernel=0.2*'
RUN python -m spylon_kernel install --sys-prefix RUN python -m spylon_kernel install --sys-prefix
...@@ -7,7 +7,7 @@ MAINTAINER Jupyter Project <jupyter@googlegroups.com> ...@@ -7,7 +7,7 @@ MAINTAINER Jupyter Project <jupyter@googlegroups.com>
USER root USER root
# Spark dependencies # Spark dependencies
ENV APACHE_SPARK_VERSION 2.0.2 ENV APACHE_SPARK_VERSION 2.1.0
ENV HADOOP_VERSION 2.7 ENV HADOOP_VERSION 2.7
# Temporarily add jessie backports to get openjdk 8, but then remove that source # Temporarily add jessie backports to get openjdk 8, but then remove that source
...@@ -19,7 +19,7 @@ RUN echo 'deb http://cdn-fastly.deb.debian.org/debian jessie-backports main' > / ...@@ -19,7 +19,7 @@ RUN echo 'deb http://cdn-fastly.deb.debian.org/debian jessie-backports main' > /
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN cd /tmp && \ RUN cd /tmp && \
wget -q http://d3kbcqa49mib13.cloudfront.net/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz && \ wget -q http://d3kbcqa49mib13.cloudfront.net/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz && \
echo "e6349dd38ded84831e3ff7d391ae7f2525c359fb452b0fc32ee2ab637673552a *spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" | sha256sum -c - && \ echo "3fc94096ae34f9a1a148d37e5ed640a7e5de1812f1f2ecd715d92bbf2901e895cf4b93e6d8ee0d64debb5df7c56d673c0a36e5fc49503ec0f4507eb0edf961a4 *spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" | sha512sum -c - && \
tar xzf spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz -C /usr/local && \ tar xzf spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz -C /usr/local && \
rm spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz rm spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz
RUN cd /usr/local && ln -s spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION} spark RUN cd /usr/local && ln -s spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION} spark
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment