From 9d847f8f01ee55910de81b3edbf3e3f66db9bc5c Mon Sep 17 00:00:00 2001 From: ashahba Date: Tue, 29 Nov 2016 21:01:12 -0500 Subject: [PATCH 1/6] Enable jupyter-spark extention --- Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4a02fd..aee828e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -205,11 +205,16 @@ COPY sparktk-ext/* $CONDA_DIR/lib/python2.7/site-packages/ RUN jupyter serverextension enable sparktk_ext -# Install remaining tk packages +# Install remaining tk packages and enable jupyter-spark extension RUN \ pip install trustedanalytics \ tabulate==0.7.5 \ - snakebite==2.11.0 + snakebite==2.11.0 \ + jupyter-spark && \ + jupyter serverextension enable --py jupyter_spark && \ + jupyter nbextension install --py jupyter_spark && \ + jupyter nbextension enable --py jupyter_spark && \ + jupyter nbextension enable --py widgetsnbextension # Final cleanup From 9c98370bd8d26e52a99080780fd5fd56032994c2 Mon Sep 17 00:00:00 2001 From: ashahba Date: Mon, 9 Jan 2017 12:45:47 -0500 Subject: [PATCH 2/6] Release 0.7.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a57d275..232c483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -187,7 +187,7 @@ RUN ln -s $CONDA_DIR/bin/pip $CONDA_DIR/bin/pip2.7 ENV SPARKTK_HOME "/usr/local/sparktk-core" ENV DAALTK_HOME "/usr/local/daaltk-core" ENV LD_LIBRARY_PATH /usr/local/daal-2016.2.181:$LD_LIBRARY_PATH -ARG TKLIBS_INSTALLER_URL="https://github.com/trustedanalytics/daal-tk/releases/download/development/daal-install" +ARG TKLIBS_INSTALLER_URL="https://github.com/trustedanalytics/daal-tk/releases/download/v0.7.4/daal-install" ARG TKLIBS_INSTALLER="daal-install" From 1b070bc7462979a2e6cda668ac28d06f585c5ac0 Mon Sep 17 00:00:00 2001 From: ashahba Date: Tue, 10 Jan 2017 16:54:10 -0500 Subject: [PATCH 3/6] daal-install --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 232c483..e17d86a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -192,9 +192,11 @@ ARG TKLIBS_INSTALLER="daal-install" # Install spark-tk/daal-tk packages -ADD $TKLIBS_INSTALLER_URL /usr/local/ -RUN chmod +x /usr/local/$TKLIBS_INSTALLER -RUN /usr/local/$TKLIBS_INSTALLER && \ +#ADD $TKLIBS_INSTALLER_URL /usr/local/ +RUN cd /usr/local && \ + wget -q --no-check-certificate $TKLIBS_INSTALLER_URL && \ + chmod +x $TKLIBS_INSTALLER && \ + ./$TKLIBS_INSTALLER && \ ln -s /usr/local/sparktk-core-* $SPARKTK_HOME && \ ln -s /usr/local/daaltk-core-* $DAALTK_HOME && \ rm -rf /usr/local/$TKLIBS_INSTALLER /usr/local/*.tar.gz @@ -207,8 +209,7 @@ RUN cd $SPARKTK_HOME && \ # copy misc modules for TAP to python2.7 site-packages -COPY misc-modules/hdfsclient.py $CONDA_DIR/lib/python2.7/site-packages/ -COPY misc-modules/tap_catalog.py $CONDA_DIR/lib/python2.7/site-packages/ +COPY misc-modules/* $CONDA_DIR/lib/python2.7/site-packages/ # enable jupyter server extention for sparktk From 0efadbd135173d6f835b179a18d14487625fa97a Mon Sep 17 00:00:00 2001 From: ashahba Date: Tue, 10 Jan 2017 16:54:10 -0500 Subject: [PATCH 4/6] daal-install --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 632ebf0..e17d86a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -196,7 +196,6 @@ ARG TKLIBS_INSTALLER="daal-install" RUN cd /usr/local && \ wget -q --no-check-certificate $TKLIBS_INSTALLER_URL && \ chmod +x $TKLIBS_INSTALLER && \ - sync && \ ./$TKLIBS_INSTALLER && \ ln -s /usr/local/sparktk-core-* $SPARKTK_HOME && \ ln -s /usr/local/daaltk-core-* $DAALTK_HOME && \ @@ -206,7 +205,6 @@ RUN cd /usr/local && \ # Install spark-tk package mainly to fix the graphframes install RUN cd $SPARKTK_HOME && \ chmod +x install.sh && \ - sync && \ ./install.sh From 7f7d0f6ac4d47af42ead2db954ceb0664188b78c Mon Sep 17 00:00:00 2001 From: ashahba Date: Wed, 11 Jan 2017 18:07:09 -0500 Subject: [PATCH 5/6] Merge from upstream --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e17d86a..632ebf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -196,6 +196,7 @@ ARG TKLIBS_INSTALLER="daal-install" RUN cd /usr/local && \ wget -q --no-check-certificate $TKLIBS_INSTALLER_URL && \ chmod +x $TKLIBS_INSTALLER && \ + sync && \ ./$TKLIBS_INSTALLER && \ ln -s /usr/local/sparktk-core-* $SPARKTK_HOME && \ ln -s /usr/local/daaltk-core-* $DAALTK_HOME && \ @@ -205,6 +206,7 @@ RUN cd /usr/local && \ # Install spark-tk package mainly to fix the graphframes install RUN cd $SPARKTK_HOME && \ chmod +x install.sh && \ + sync && \ ./install.sh From a27f50e99385d646d7f77382a1543786acf3e18e Mon Sep 17 00:00:00 2001 From: ashahba Date: Mon, 6 Feb 2017 14:02:03 -0500 Subject: [PATCH 6/6] Fix for openjdk-8 debian jessie bug --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ef5e578..8200b1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN \ echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/openjdk-8-jdk.list && \ apt-get update && \ echo "===> install Java" && \ - apt-get install -yq --no-install-recommends --fix-missing openjdk-8-jdk + apt install -t jessie-backports -yq --no-install-recommends --fix-missing openjdk-8-jre-headless ca-certificates-java # define default command