From 8974dbbe08c11892a611cf27f522d342071fa985 Mon Sep 17 00:00:00 2001 From: Alan Du Date: Thu, 17 Nov 2016 15:45:55 +0000 Subject: [PATCH 1/3] Upgrade Julia to v0.5 This is pretty hacky -- we're using a Ubuntu 14.04 PPA to install something on Debian Jessie -- but everything seems to work. --- datascience-notebook/Dockerfile | 4 +++- datascience-notebook/README.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index bbfb24ca..332f7f43 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -15,7 +15,9 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # Julia dependencies -RUN apt-get update && \ +RUN echo "deb http://ppa.launchpad.net/staticfloat/juliareleases/ubuntu trusty main" > /etc/apt/sources.list.d/julia.list && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3D3D3ACC && \ + apt-get update && \ apt-get install -y --no-install-recommends \ julia \ libnettle4 && apt-get clean && \ diff --git a/datascience-notebook/README.md b/datascience-notebook/README.md index 5775ce52..f9229f90 100644 --- a/datascience-notebook/README.md +++ b/datascience-notebook/README.md @@ -9,7 +9,7 @@ * pandas, matplotlib, scipy, seaborn, scikit-learn, scikit-image, sympy, cython, patsy, statsmodel, cloudpickle, dill, numba, bokeh pre-installed * Conda R v3.3.x and channel * plyr, devtools, dplyr, ggplot2, tidyr, shiny, rmarkdown, forecast, stringr, rsqlite, reshape2, nycflights13, caret, rcurl, and randomforest pre-installed -* Julia v0.3.x with Gadfly, RDatasets and HDF5 pre-installed +* Julia v0.5.x with Gadfly, RDatasets and HDF5 pre-installed * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda` * [tini](https://github.com/krallin/tini) as the container entrypoint and [start-notebook.sh](../base-notebook/start-notebook.sh) as the default command * A [start-singleuser.sh](../base-notebook/start-singleuser.sh) script useful for running a single-user instance of the Notebook server, as required by JupyterHub From 77669a9352956018e0c0b65c6565446cc3fa99b3 Mon Sep 17 00:00:00 2001 From: Alan Du Date: Thu, 17 Nov 2016 15:46:33 +0000 Subject: [PATCH 2/3] Fix Julia DL_LOAD_PATH --- datascience-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 332f7f43..569a9193 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -58,5 +58,5 @@ RUN julia -e 'Pkg.add("IJulia")' && \ # Show Julia where conda libraries are # Add essential packages -RUN echo "push!(Sys.DL_LOAD_PATH, \"$CONDA_DIR/lib\")" > /home/$NB_USER/.juliarc.jl && \ +RUN echo "push!(Libdl.DL_LOAD_PATH, \"$CONDA_DIR/lib\")" > /home/$NB_USER/.juliarc.jl && \ julia -e 'Pkg.add("Gadfly")' && julia -e 'Pkg.add("RDatasets")' && julia -F -e 'Pkg.add("HDF5")' From 4c3db22140081b4407fb0626426d4b86dde62d9b Mon Sep 17 00:00:00 2001 From: Alan Du Date: Thu, 17 Nov 2016 15:57:17 +0000 Subject: [PATCH 3/3] Precompile Julia packages --- datascience-notebook/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 569a9193..4dd36688 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -60,3 +60,6 @@ RUN julia -e 'Pkg.add("IJulia")' && \ # Add essential packages RUN echo "push!(Libdl.DL_LOAD_PATH, \"$CONDA_DIR/lib\")" > /home/$NB_USER/.juliarc.jl && \ julia -e 'Pkg.add("Gadfly")' && julia -e 'Pkg.add("RDatasets")' && julia -F -e 'Pkg.add("HDF5")' + +# Precompile Julia pakcages +RUN julia -e 'using IJulia' && julia -e 'using Gadfly' && julia -e 'using RDatasets'&& julia -e 'using HDF5'