Merge branch 'master' into repo-language

This commit is contained in:
Brian Christner 2017-02-20 09:58:12 +01:00 committed by GitHub
commit 348778478e
2 changed files with 7 additions and 0 deletions

View File

@ -19,6 +19,12 @@ Please note that this project is released with a [Contributor Code of Conduct](h
or you can or you can
#### Join the chat:
[![Join the chat at https://gitter.im/veggiemonk/awesome-docker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/veggiemonk/awesome-docker)
or you can
#### ping us on twitter: #### ping us on twitter:
* [veggiemonk](https://twitter.com/veggiemonk) * [veggiemonk](https://twitter.com/veggiemonk)

View File

@ -499,6 +499,7 @@ Services to securely store your Docker images.
* [Docker Team](https://www.docker.com/) * [Docker Team](https://www.docker.com/)
* [Shippable](http://blog.shippable.com/) * [Shippable](http://blog.shippable.com/)
* [WebOps weekly](http://webopsweekly.com/) * [WebOps weekly](http://webopsweekly.com/)
* [DevOpsLinks](http://devopslinks.com)
## Security ## Security
* [Bringing new security features to Docker](https://opensource.com/business/14/9/security-for-docker) * [Bringing new security features to Docker](https://opensource.com/business/14/9/security-for-docker)