From 790eaf2e4fb627566c7322bd51bc5d0aa704f6cf Mon Sep 17 00:00:00 2001 From: John Matson Date: Fri, 9 Dec 2016 17:09:29 -0800 Subject: [PATCH 1/2] Fix typos --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2370744..f6b4902 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ about docker! (Tips: checkout her [dotfiles][jfrazelledotfiles] and her [dockerf [@gesellix][gesellix] * [Containerization and the PaaS Cloud](https://www.computer.org/cms/Computer.org/ComputingNow/issues/2015/09/mcd2015030024.pdf) -- This article discusses the requirements that arise from having to facilitate applications through distributed multicloud platforms. * [Docker for Development: Common Problems and Solutions](https://medium.com/@rdsubhas/docker-for-development-common-problems-and-solutions-95b25cae41eb) by [@rdsubhas](https://github.com/rdsubhas) -* [Docker Adoption Data](https://www.datadoghq.com/docker-adoption/) A study by Datadog on the real world Docker usage stastics and deployment patterns. +* [Docker Adoption Data](https://www.datadoghq.com/docker-adoption/) A study by Datadog on the real world Docker usage statistics and deployment patterns. * [How to monitor Docker](https://www.datadoghq.com/blog/the-docker-monitoring-problem/) (4-part series) * [Using Ansible with Docker Machine to Bootstrap Host Nodes](https://nathanleclaire.com/blog/2015/11/10/using-ansible-with-docker-machine-to-bootstrap-host-nodes/) by [@nathanleclaire](https://github.com/nathanleclaire) * [Swarm v. Fleet v. Kubernetes v. Mesos](https://www.oreilly.com/ideas/swarm-v-fleet-v-kubernetes-v-mesos) Comparing different orchestration tools. (written OCT 2015) @@ -266,7 +266,7 @@ by [@prologic][prologic] * [Tuning Docker with the newest security enhancements](https://opensource.com/business/15/3/docker-security-tuning) * [Lynis is an open source security auditing tool including Docker auditing](https://cisofy.com/lynis/) * [Understanding Docker security and best practices](https://blog.docker.com/2015/05/understanding-docker-security-and-best-practices/) (written 5 MAY 2015) -* [Docker Security Cheat Sheet] (https://github.com/konstruktoid/Docker/blob/master/Security/CheatSheet.adoc) +* [Docker Security Cheat Sheet](https://github.com/konstruktoid/Docker/blob/master/Security/CheatSheet.adoc) * [How CVE's are handled on Offical Docker Images](https://github.com/docker-library/official-images/issues/1448) * [Improving Docker Security with Authenticated Volumes](https://www.blockbridge.com/improving-docker-security-with-authenticated-volumes/) @@ -586,7 +586,7 @@ desktop! * [Dockerana](https://github.com/dockerana/dockerana) (packaged version of Graphite and Grafana, specifically targeted at metrics from Docker.) * [Docker-mon](https://github.com/icecrime/docker-mon) (Console-based Docker monitoring) by [@icecrime](https://github.com/icecrime) * [Dynatrace](https://www.dynatrace.com/technologies/cloud-and-microservices/docker-monitoring/) Monitor containerized applications without installing agents or modifying your Run commands -* [Glances] (http://nicolargo.github.io/glances/) (A cross-platform curses-based system monitoring tool written in Python) by [@nicolargo](https://github.com/nicolargo) +* [Glances](http://nicolargo.github.io/glances/) (A cross-platform curses-based system monitoring tool written in Python) by [@nicolargo](https://github.com/nicolargo) * [InfluxDB, cAdvisor, Grafana](https://github.com/vegasbrianc/docker-monitoring) (InfluxDB Time series DB in combination with Grafana and cAdvisor) by [@vegasbrianc][vegasbrianc] * [Meros](https://meros.io) Analyzes containers resources, captures logs, remote web SSH terminal and powerful DevOps alerts. * [New Relic](https://newrelic.com/partner/docker) New Relics Docker Monitoring tool @@ -636,7 +636,7 @@ desktop! * [Flynn](https://github.com/flynn/flynn) (A next generation open source platform as a service) -- https://flynn.io/ * [OpenShift][openshift] (An open source PaaS built on [Kubernetes][kubernetes] and optimized for Dockerized app development and deployment) by [Red Hat](https://www.redhat.com/) * [Tsuru](https://github.com/tsuru/tsuru) (Tsuru is an extensible and open source Platform as a Service software) -- https://tsuru.io/ -* [Convox Rack] (https://github.com/convox/rack): Convox Rack is open source PaaS built on top of expert infrastructure automation and devops best practices. +* [Convox Rack](https://github.com/convox/rack): Convox Rack is open source PaaS built on top of expert infrastructure automation and devops best practices. * [Rancher][rancher]: Rancher is an open source project that provides a complete platform for operating Docker in production * [Dcw](https://github.com/pbertera/dcw): Docker-compose SSH wrapper: a very poor man PaaS, exposing the docker-compose and custom-container commands defined in container labels. * [Dockhero](https://dockhero.io/): Dockhero is a Heroku add-on which turns a Docker image into a microservice attached to the Heroku app. Currently in beta. @@ -645,7 +645,7 @@ desktop! * [autodock](https://github.com/prologic/autodock) (Daemon for Docker Automation) by [@prologic][prologic] * [blimp](https://github.com/tubesandlube/blimp) Uses Docker Machine to easily move a container from one Docker host to another, show containers running against all of your hosts, replicate a container across multiple hosts and more. By [@defermat](https://github.com/defermat) and [@schvin](https://github.com/schvin) -* [Capitan] (https://github.com/byrnedo/capitan) Composable docker orchestration with added scripting support by [@byrnedo](https://github.com/byrnedo). +* [Capitan](https://github.com/byrnedo/capitan) Composable docker orchestration with added scripting support by [@byrnedo](https://github.com/byrnedo). * [CloudSlang](http://www.cloudslang.io/) (CloudSlang is a workflow engine to create Docker process automation) * [ContainerShip](https://github.com/containership/containership) (A simple container management platform) -- [containership] * [CoreOS][coreos] (Linux for Massive Server Deployments) -- https://coreos.com/ @@ -657,7 +657,7 @@ desktop! * [Kubernetes][kubernetes] (Open source orchestration system for Docker containers by Google) -- [kubernetes] See Also [awesome-kubernetes](https://github.com/ramitsurana/awesome-kubernetes) by [@ramitsurana][ramitsurana] * [Maestro](https://github.com/toscanini/maestro) (Maestro provides the ability to easily launch, orchestrate and manage mulitiple Docker containers as single unit) by [@tascanini](https://github.com/toscanini) * [Marathon](https://mesosphere.github.io/marathon/docs/) (Marathon is a private PaaS built on Mesos. It automatically handles hardware or software failures and ensures that an app is "always on") -* [Nomad Project] (https://www.nomadproject.io/) Easily deploy applications at any scale. A Distributed, Highly Available, Datacenter-Aware Scheduler. +* [Nomad Project](https://www.nomadproject.io/) Easily deploy applications at any scale. A Distributed, Highly Available, Datacenter-Aware Scheduler. * [Panamax](https://github.com/CenturyLinkLabs/panamax-ui/wiki) (Docker Management for Humans) -- [panamax.io] * [Rancher](https://github.com/rancher/rancher) (Portable AWS-style infrastructure service for Docker) -- http://rancher.com/ * [Fleet](https://github.com/coreos/fleet) (A Distributed init System providing low-level orchestration ) -- [coreos.com] From 64c6f3d2097836a948fd7c1182224f2909ec6328 Mon Sep 17 00:00:00 2001 From: John Matson Date: Fri, 9 Dec 2016 17:09:46 -0800 Subject: [PATCH 2/2] Add article with ECS adoption stats --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f6b4902..52d7675 100644 --- a/README.md +++ b/README.md @@ -203,6 +203,7 @@ by [@prologic][prologic] ## Cloud Infrastructure * [Cloud Infrastructure Automation for Docker Nodes](https://blog.tutum.co/2015/04/29/cloud-infrastructure-automation-for-docker-nodes/) +* [3 clear trends in Amazon ECS adoption and usage](https://www.datadoghq.com/blog/3-clear-trends-in-ecs-adoption/) ## Good Tips * [24 random docker tips](https://csabapalfi.github.io/random-docker-tips/) by [@csabapalfi](https://github.com/csabapalfi)