From 2a05797b898e5b3513394b55c01dab1f95bfeeb0 Mon Sep 17 00:00:00 2001 From: Manny Cato Date: Tue, 10 Sep 2019 10:14:51 -0700 Subject: [PATCH 1/2] Address updating base notebook to jupyterlab 1.1.3 --- base-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index cb533246..13406c49 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -104,7 +104,7 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \ RUN conda install --quiet --yes \ 'notebook=6.0.0' \ 'jupyterhub=1.0.0' \ - 'jupyterlab=1.0.4' && \ + 'jupyterlab=1.1.3' && \ conda clean --all -f -y && \ npm cache clean --force && \ jupyter notebook --generate-config && \ From 1089ae349c02c3e5307b90ba9ca59dc228850dc5 Mon Sep 17 00:00:00 2001 From: Manny Cato Date: Tue, 10 Sep 2019 16:25:27 -0700 Subject: [PATCH 2/2] Address updating spark version to fix wget error --- pyspark-notebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index 9cd23329..dd109f82 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -8,7 +8,7 @@ LABEL maintainer="Jupyter Project " USER root # Spark dependencies -ENV APACHE_SPARK_VERSION 2.4.3 +ENV APACHE_SPARK_VERSION 2.4.4 ENV HADOOP_VERSION 2.7 RUN apt-get -y update && \ @@ -17,7 +17,7 @@ RUN apt-get -y update && \ RUN cd /tmp && \ wget -q http://mirrors.ukfast.co.uk/sites/ftp.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz && \ - echo "E8B7F9E1DEC868282CADCAD81599038A22F48FB597D44AF1B13FCC76B7DACD2A1CAF431F95E394E1227066087E3CE6C2137C4ABAF60C60076B78F959074FF2AD *spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" | sha512sum -c - && \ + echo "2E3A5C853B9F28C7D4525C0ADCB0D971B73AD47D5CCE138C85335B9F53A6519540D3923CB0B5CEE41E386E49AE8A409A51AB7194BA11A254E037A848D0C4A9E5 *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 --owner root --group root --no-same-owner && \ 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