Merge pull request #80 from alessandroleite/master

Include a reference to the talk: 6 Million Ways To Log In Docker
This commit is contained in:
Julien Bisconti 2015-09-22 17:33:28 +02:00
commit c8a9dafbd0

View File

@ -162,6 +162,7 @@ _Source:_ [What is Docker](https://www.docker.com/whatisdocker/)
* [Docker Tips](http://mervine.net/notes/docker-tips) by [@jmervine](https://github.com/jmervine)
* [Docker on Windows behind a firewall](http://toedter.com/2015/05/11/docker-on-windows-behind-a-firewall/) by [@kaitoedter](http://twitter.com/kaitoedter)
* [Pulling Git into a Docker image without leaving SSH keys behind](http://blog.cloud66.com/pulling-git-into-a-docker-image-without-leaving-ssh-keys-behind/) by [@khash](https://github.com/khash)
* [6 Million Ways To Log In Docker](http://www.slideshare.net/raychaser/6-million-ways-to-log-in-docker-nyc-docker-meetup-12172014) by [@aychaser](https://twitter.com/aychaser)
## Newsletter
* [Docker Team](https://www.docker.com/)