From 688d29716a018a988a2116f03edd1e347e6df11c Mon Sep 17 00:00:00 2001
From: cap <cap@pycon>
Date: Mon, 22 May 2017 16:35:33 -0700
Subject: [PATCH] updated dockerfiles with instructions for dealing with common
 build failures and updated base image from python 2.7 to 3.5

---
 Dockerfile     | 2 +-
 Dockerfile-dev | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9686448faf..c07be9b044 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@
 #
 #    docker exec -it zipline zipline run -f /projects/my_algo.py --start 2015-1-1 --end 2016-1-1 /projects/result.pickle
 #
-FROM python:2.7
+FROM python:3.5
 
 #
 # set up environment
diff --git a/Dockerfile-dev b/Dockerfile-dev
index 47dfd0c6d5..96a1c6bb03 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -3,6 +3,10 @@
 #
 #    docker build -t quantopian/ziplinedev -f Dockerfile-dev .
 #
+# Note: the dev build requires a quantopian/zipline image, which you can build as follows:
+#
+#    docker build -t quantopian/zipline -f Dockerfile
+#
 # To run the container:
 #
 #    docker run -v /path/to/your/notebooks:/projects -v ~/.zipline:/root/.zipline -p 8888:8888/tcp --name ziplinedev -it quantopian/ziplinedev