new docker resource

mattmakai · mattmakai · commit ef72e71815c6 · 2015-06-12T10:50:40.000-07:00
diff --git a/all.html b/all.html
@@ -5974,6 +5974,11 @@ <h2>Docker resources</h2>
   shares lessons learned and explains how to work with the containers so you 
   get more use out of them during development.</p>
 </li>
+<li>
+<p><a href="https://bildung.xarif.de/xwiki/bin/Articles/The+Marriage+of+Ansible+and+Docker">The marriage of Ansible and Docker</a>
+  is a detailed look at how Docker and Ansible complement each other as
+  deployment tools.</p>
+</li>
 </ul>
 <h2>Python-specific Docker resources</h2>
 <ul>
diff --git a/docker.html b/docker.html
@@ -79,6 +79,11 @@ <h2>Docker resources</h2>
   shares lessons learned and explains how to work with the containers so you 
   get more use out of them during development.</p>
 </li>
+<li>
+<p><a href="https://bildung.xarif.de/xwiki/bin/Articles/The+Marriage+of+Ansible+and+Docker">The marriage of Ansible and Docker</a>
+  is a detailed look at how Docker and Ansible complement each other as
+  deployment tools.</p>
+</li>
 </ul>
 <h2>Python-specific Docker resources</h2>
 <ul>
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-11T10:12:27Z</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-12T10:50:37Z</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
@@ -47,6 +47,10 @@ on Amazon Web Services, Google Compute Engine, Linode, Rackspace or elsewhere.
   shares lessons learned and explains how to work with the containers so you 
   get more use out of them during development.
 
+* [The marriage of Ansible and Docker](https://bildung.xarif.de/xwiki/bin/Articles/The+Marriage+of+Ansible+and+Docker)
+  is a detailed look at how Docker and Ansible complement each other as
+  deployment tools.
+
 
 ## Python-specific Docker resources
 * [Hosting Python WSGI applications using Docker](http://blog.dscpl.com.au/2014/12/hosting-python-wsgi-applications-using.html)

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-11T10:12:27Z</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-12T10:50:37Z</updated></feed>`