Merge pull request #46 from alessandroleite/master

Include the article: Docker vs. VMs? Combining Both for Cloud Portability Nirvana
This commit is contained in:
Julien Bisconti 2015-07-29 10:33:07 +02:00
commit 6f730898c0

View File

@ -100,6 +100,7 @@ _Source:_ [What is Docker](https://www.docker.com/whatisdocker/)
* [Contrainer solutions](http://container-solutions.com/blog/) * [Contrainer solutions](http://container-solutions.com/blog/)
* [DockerOne](http://dockerone.com/) Docker Community (in Chinese) by [@LiYingJie](http://dockerone.com/people/%E6%9D%8E%E9%A2%96%E6%9D%B0) * [DockerOne](http://dockerone.com/) Docker Community (in Chinese) by [@LiYingJie](http://dockerone.com/people/%E6%9D%8E%E9%A2%96%E6%9D%B0)
* [Project Web Dev](http://project-webdev.blogspot.de) : (Article series) How to create your own website based on Docker * [Project Web Dev](http://project-webdev.blogspot.de) : (Article series) How to create your own website based on Docker
* [Docker vs. VMs? Combining Both for Cloud Portability Nirvana](http://www.rightscale.com/blog/cloud-management-best-practices/docker-vs-vms-combining-both-cloud-portability-nirvana)
* [Docker Containers on the desktop](https://blog.jessfraz.com/post/docker-containers-on-the-desktop/) by [@jfrazelle](https://github.com/jfrazelle) The **funniest way** to learn about docker! (Tips: checkout her [dotfiles](https://github.com/jfrazelle/dotfiles) and her [dockerfiles](https://github.com/jfrazelle/dockerfiles)) * [Docker Containers on the desktop](https://blog.jessfraz.com/post/docker-containers-on-the-desktop/) by [@jfrazelle](https://github.com/jfrazelle) The **funniest way** to learn about docker! (Tips: checkout her [dotfiles](https://github.com/jfrazelle/dotfiles) and her [dockerfiles](https://github.com/jfrazelle/dockerfiles))
## General Articles ## General Articles