new docker resource

mattmakai · mattmakai · commit bcbf31bd4bae · 2015-06-21T12:34:07.000-07:00
diff --git a/all.html b/all.html
@@ -6222,6 +6222,12 @@ <h2>Docker resources</h2>
   well worth buying.</p>
 </li>
 <li>
+<p><a href="http://blog.circleci.com/it-really-is-the-future/">It Really is the Future</a>
+  discusses Docker and containers in the context of whether it's all just a
+  bunch of hype or if this is a real trend for infrastructure automation.
+  This is a great read to set the context for why these tools are important.</p>
+</li>
+<li>
 <p><a href="https://github.com/odewahn/docker-jumpstart/">Docker Jumpstart</a> is a 
   comprehensive introduction to what Docker is and how to get started with
   using the tool.</p>
diff --git a/docker.html b/docker.html
@@ -60,6 +60,12 @@ <h2>Docker resources</h2>
   well worth buying.</p>
 </li>
 <li>
+<p><a href="http://blog.circleci.com/it-really-is-the-future/">It Really is the Future</a>
+  discusses Docker and containers in the context of whether it's all just a
+  bunch of hype or if this is a real trend for infrastructure automation.
+  This is a great read to set the context for why these tools are important.</p>
+</li>
+<li>
 <p><a href="https://github.com/odewahn/docker-jumpstart/">Docker Jumpstart</a> is a 
   comprehensive introduction to what Docker is and how to get started with
   using the tool.</p>
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-06-20T11:48:37Z</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-06-21T12:34:04Z</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
@@ -31,6 +31,11 @@ on Amazon Web Services, Google Compute Engine, Linode, Rackspace or elsewhere.
   [O'Reilly Introduction to Docker video](http://shop.oreilly.com/product/0636920035732.do) that's
   well worth buying.
 
+* [It Really is the Future](http://blog.circleci.com/it-really-is-the-future/)
+  discusses Docker and containers in the context of whether it's all just a
+  bunch of hype or if this is a real trend for infrastructure automation.
+  This is a great read to set the context for why these tools are important.
+
 * [Docker Jumpstart](https://github.com/odewahn/docker-jumpstart/) is a 
   comprehensive introduction to what Docker is and how to get started with
   using the tool.

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-06-20T11:48:37Z</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-06-21T12:34:04Z</updated></feed>`