From df934df0b4007bc6fff229ce68f14f63d988d18e Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Thu, 1 Jun 2017 12:01:51 -0700
Subject: [PATCH] s2i/venv: Add enough packages to build non-wheel matplotlib

Eventually we should probably switch to a 2 stage build, but until
then this is good enough
---
 repo2docker/detectors.py         | 4 ++--
 s2i-builders/venv/Dockerfile     | 7 ++++++-
 s2i-builders/venv/Dockerfile.py2 | 5 ++++-
 s2i-builders/venv/version        | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/repo2docker/detectors.py b/repo2docker/detectors.py
index ba903017..06959103 100644
--- a/repo2docker/detectors.py
+++ b/repo2docker/detectors.py
@@ -140,8 +140,8 @@ class PythonBuildPack(S2IBuildPack):
     """Build Pack for installing from a pip requirements.txt using S2I"""
     name = Unicode('python-pip')
     runtime_builder_map = Dict({
-        'python-2.7': 'jupyterhub/singleuser-builder-venv-2.7:v0.2.0',
-        'python-3.5': 'jupyterhub/singleuser-builder-venv-3.5:v0.2.0',
+        'python-2.7': 'jupyterhub/singleuser-builder-venv-2.7:v0.2.1',
+        'python-3.5': 'jupyterhub/singleuser-builder-venv-3.5:v0.2.1',
     })
 
     runtime = Unicode(
diff --git a/s2i-builders/venv/Dockerfile b/s2i-builders/venv/Dockerfile
index e16d8fc1..82e534e2 100644
--- a/s2i-builders/venv/Dockerfile
+++ b/s2i-builders/venv/Dockerfile
@@ -8,9 +8,14 @@ ENV APP_DIR /srv/app
 ENV PATH ${APP_DIR}/venv/bin:$PATH
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends \
+    apt-get install --yes \
             python3 \
             python3-venv \
+            python3-dev \
+            build-essential \
+            pkg-config \
+            libfreetype6-dev \
+            libpng-dev \
             tar \
             git \
             locales && \
diff --git a/s2i-builders/venv/Dockerfile.py2 b/s2i-builders/venv/Dockerfile.py2
index 47e8ea34..b1ac9f29 100644
--- a/s2i-builders/venv/Dockerfile.py2
+++ b/s2i-builders/venv/Dockerfile.py2
@@ -8,10 +8,13 @@ ENV APP_DIR /srv/app
 ENV PATH ${APP_DIR}/venv/bin:$PATH
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends \
+    apt-get install --yes \
             python \
             python-dev \
             build-essential \
+            pkg-config \
+            libfreetype6-dev \
+            libpng-dev \
             virtualenv \
             tar \
             git \
diff --git a/s2i-builders/venv/version b/s2i-builders/venv/version
index 1474d00f..22c08f72 100644
--- a/s2i-builders/venv/version
+++ b/s2i-builders/venv/version
@@ -1 +1 @@
-v0.2.0
+v0.2.1