From e79567514e14940d180724726d78b3de3b0dd651 Mon Sep 17 00:00:00 2001 From: "Fernando F. Torres" Date: Tue, 10 May 2016 08:18:11 -0300 Subject: [PATCH 1/3] Add Buddy.works to CI & CD section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a307ea7..b15b875 100644 --- a/README.md +++ b/README.md @@ -352,6 +352,7 @@ by [@prologic][prologic] ## Continuous Integration / Continuous Delivery * [Awesome-ciandcd](https://github.com/ciandcd/awesome-ciandcd) - Not specific to docker but relevant. +* [Buddy](https://buddy.works) - The best of Git, build & deployment tools combined into one powerful tool that supercharged our development * [Captain](https://github.com/harbur/captain) - Convert your Git workflow to Docker containers ready for Continuous Delivery by [@harbur](https://github.com/harbur) * [CircleCI](https://circleci.com/) - Push or pull Docker images from your build environment, or build and run containers right on CircleCI. * [CodeFresh](https://codefresh.io) - Accelerate your transition to Docker containers From 4fddca2c464ef4797f30419af4388493f2518a77 Mon Sep 17 00:00:00 2001 From: Fernando Torres Date: Wed, 19 Oct 2016 09:50:10 -0200 Subject: [PATCH 2/3] Add new entry on Articles / Networking Added "Demystifying Docker overlay networking" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b15b875..276e3bb 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ about docker! (Tips: checkout her [dotfiles][jfrazelledotfiles] and her [dockerf ## Networking * [Using Docker Machine with Weave 0.10](https://www.weave.works/using-docker-machine-with-weave-0-10/) (written 22 APR 2015) * [How to Route Traffic through a Tor Docker container](https://blog.jessfraz.com/post/routing-traffic-through-tor-docker-container/) by [@jfrazelle][jfrazelle] (writtent 20 JUN 2015) - +* [Demystifing Docker overlay networking](http://blog.nigelpoulton.com/demystifying-docker-overlay-networking/) by [@nigelpoulton][nigelpoulton] (written 12 OCT 2016) ## Metal * [How to use Docker on Full Metal](http://blog.bigstep.com/big-data-performance/use-docker-full-metal-cloud/) From 16856d4cffad76aa883fe6e2dbb860cabb450c3d Mon Sep 17 00:00:00 2001 From: Fernando Torres Date: Wed, 19 Oct 2016 09:56:13 -0200 Subject: [PATCH 3/3] Fix entry on Articles / Networking Fix issues with MARKDOWN --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 276e3bb..88dc96f 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,8 @@ about docker! (Tips: checkout her [dotfiles][jfrazelledotfiles] and her [dockerf ## Networking * [Using Docker Machine with Weave 0.10](https://www.weave.works/using-docker-machine-with-weave-0-10/) (written 22 APR 2015) * [How to Route Traffic through a Tor Docker container](https://blog.jessfraz.com/post/routing-traffic-through-tor-docker-container/) by [@jfrazelle][jfrazelle] (writtent 20 JUN 2015) -* [Demystifing Docker overlay networking](http://blog.nigelpoulton.com/demystifying-docker-overlay-networking/) by [@nigelpoulton][nigelpoulton] (written 12 OCT 2016) +* [Demystifing Docker overlay networking](http://blog.nigelpoulton.com/demystifying-docker-overlay-networking/). By [@nigelpoulton] (written 12 OCT 2016) + ## Metal * [How to use Docker on Full Metal](http://blog.bigstep.com/big-data-performance/use-docker-full-metal-cloud/)