new docker tutorial

mattmakai · mattmakai · commit b5519003a45d · 2015-05-02T17:21:32.000-04:00
diff --git a/all.html b/all.html
@@ -5522,6 +5522,11 @@ <h2>Python-specific Docker resources</h2>
   provides specific commands and expected output for running Django apps
   with Docker and Vagrant.</p>
 </li>
+<li>
+<p><a href="https://www.calazan.com/using-docker-and-docker-compose-for-local-django-development-replacing-virtualenv/">Using Docker and Docker Compose to replace virtualenv</a>
+  is a tutorial for using Docker instead of virtualenv for dependency
+  isolation.</p>
+</li>
 </ul>
 <h3>What do you want to learn next about deployment?</h3>
           <h1>Caching</h1>
diff --git a/docker.html b/docker.html
@@ -102,6 +102,11 @@ <h2>Python-specific Docker resources</h2>
   provides specific commands and expected output for running Django apps
   with Docker and Vagrant.</p>
 </li>
+<li>
+<p><a href="https://www.calazan.com/using-docker-and-docker-compose-for-local-django-development-replacing-virtualenv/">Using Docker and Docker Compose to replace virtualenv</a>
+  is a tutorial for using Docker instead of virtualenv for dependency
+  isolation.</p>
+</li>
 </ul>
 <h3>What do you want to learn next about deployment?</h3>
 <div class="row">
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-04-30T08:11:30Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-02T17:21:24Z</updated></feed>
diff --git a/source/content/pages/07-web-app-deployment/17-docker.markdown b/source/content/pages/07-web-app-deployment/17-docker.markdown
@@ -65,5 +65,9 @@ on Amazon Web Services, Google Compute Engine, Linode, Rackspace or elsewhere.
   provides specific commands and expected output for running Django apps
   with Docker and Vagrant.
 
+* [Using Docker and Docker Compose to replace virtualenv](https://www.calazan.com/using-docker-and-docker-compose-for-local-django-development-replacing-virtualenv/)
+  is a tutorial for using Docker instead of virtualenv for dependency
+  isolation.
+
 
 ### What do you want to learn next about deployment?

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-04-30T08:11:30Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-02T17:21:24Z</updated></feed>`