From ac53e57ed992ebdb2ed22b76e792d4c49570837f Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Thu, 9 Jun 2016 19:26:45 -0400
Subject: [PATCH] pyspark-notebook: Use `jq` from `conda-forge`.

---
 pyspark-notebook/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile
index 9b8f65d3..4153ab35 100644
--- a/pyspark-notebook/Dockerfile
+++ b/pyspark-notebook/Dockerfile
@@ -6,9 +6,6 @@ MAINTAINER Jupyter Project <jupyter@googlegroups.com>
 
 USER root
 
-# Util to help with kernel spec later
-RUN apt-get -y update && apt-get -y install jq && apt-get clean && rm -rf /var/lib/apt/lists/*
-
 # Spark dependencies
 ENV APACHE_SPARK_VERSION 1.6.1
 RUN apt-get -y update && \
@@ -53,6 +50,7 @@ RUN conda install --quiet --yes \
     'scipy=0.17*' \
     'seaborn=0.7*' \
     'scikit-learn=0.17*' \
+    jq \
     && conda clean -tipsy
 # Activate ipywidgets extension in the environment that runs the notebook server
 RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix