From b7aeac87f470f3600d63209db20acafd4b5abd0c Mon Sep 17 00:00:00 2001
From: Peter Parente <pparent@us.ibm.com>
Date: Tue, 29 Dec 2015 09:35:16 -0500
Subject: [PATCH] Install libxrender1 to appease matplotlib

Bite the bullet and preinstall it so that plotting libs that default
to using desktop rendering just work (matplotlib, ggplot, ...)
out of the box without having to get configuration right beforehand
(e.g., %matplotlib inline ahead of matplotlib import)

Only adds ~100k to the image size

(c) Copyright IBM Corp. 2015
---
 all-spark-notebook/Dockerfile   | 1 -
 datascience-notebook/Dockerfile | 1 -
 minimal-notebook/Dockerfile     | 1 +
 r-notebook/Dockerfile           | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile
index 312c4eb1..505588a5 100644
--- a/all-spark-notebook/Dockerfile
+++ b/all-spark-notebook/Dockerfile
@@ -49,7 +49,6 @@ ENV SPARK_OPTS --driver-java-options=-Xms1024M --driver-java-options=-Xmx4096M -
 # R pre-requisites
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    libxrender1 \
     fonts-dejavu \
     gfortran \
     gcc && apt-get clean
diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
index 519ab580..1f3a5269 100644
--- a/datascience-notebook/Dockerfile
+++ b/datascience-notebook/Dockerfile
@@ -7,7 +7,6 @@ USER root
 # R pre-requisites
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    libxrender1 \
     fonts-dejavu \
     gfortran \
     gcc && apt-get clean
diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile
index 542daa0d..fc99711f 100644
--- a/minimal-notebook/Dockerfile
+++ b/minimal-notebook/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
     texlive-fonts-recommended \
     sudo \
     locales \
+    libxrender1 \
     && apt-get clean
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
     locale-gen
diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
index 749b25a2..d161084c 100644
--- a/r-notebook/Dockerfile
+++ b/r-notebook/Dockerfile
@@ -8,7 +8,6 @@ USER root
 # R pre-requisites
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    libxrender1 \
     fonts-dejavu \
     gfortran \
     gcc && apt-get clean