From 982c35f8e7b04b4ed5e8f79cea3a029ff71c1bee Mon Sep 17 00:00:00 2001 From: Bret Fisher Date: Wed, 18 Apr 2018 17:28:46 -0400 Subject: [PATCH 1/3] add popular swarm reverse proxy options --- slides/swarm/firstservice.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/slides/swarm/firstservice.md b/slides/swarm/firstservice.md index 56bef3d0..13377bd3 100644 --- a/slides/swarm/firstservice.md +++ b/slides/swarm/firstservice.md @@ -379,6 +379,14 @@ class: btw-labels - labels are detected automatically and dynamically update the configuration +- Two common open source "reverse proxy" options + + - [Traefik](https://traefik.io/) - uses NGINX, popular, requires proxy be on managers, + needs DB for HA + + - [Docker Flow Proxy](http://proxy.dockerflow.com/) - uses HAProxy, made for + Swarm by Docker Captian [@vfarcic](https://twitter.com/vfarcic) + --- class: btw-labels From cc8e13a85fc3877f1ada129c10bb0d2d1e2b177f Mon Sep 17 00:00:00 2001 From: Bret Fisher Date: Fri, 20 Apr 2018 03:07:40 -0400 Subject: [PATCH 2/3] silly me, Traefik is golang --- slides/swarm/firstservice.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/swarm/firstservice.md b/slides/swarm/firstservice.md index 13377bd3..28b352b9 100644 --- a/slides/swarm/firstservice.md +++ b/slides/swarm/firstservice.md @@ -381,8 +381,8 @@ class: btw-labels - Two common open source "reverse proxy" options - - [Traefik](https://traefik.io/) - uses NGINX, popular, requires proxy be on managers, - needs DB for HA + - [Traefik](https://traefik.io/) - popular, many features, requires running on managers, + needs key/value for HA - [Docker Flow Proxy](http://proxy.dockerflow.com/) - uses HAProxy, made for Swarm by Docker Captian [@vfarcic](https://twitter.com/vfarcic) From e985952816422e6da7aa871595a44b7e8ef0a0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Fri, 20 Apr 2018 02:37:48 -0500 Subject: [PATCH 3/3] Add colon and fix minor typo --- slides/swarm/firstservice.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/swarm/firstservice.md b/slides/swarm/firstservice.md index 28b352b9..34e7f5eb 100644 --- a/slides/swarm/firstservice.md +++ b/slides/swarm/firstservice.md @@ -379,13 +379,13 @@ class: btw-labels - labels are detected automatically and dynamically update the configuration -- Two common open source "reverse proxy" options +- Two common open source "reverse proxy" options: - [Traefik](https://traefik.io/) - popular, many features, requires running on managers, needs key/value for HA - [Docker Flow Proxy](http://proxy.dockerflow.com/) - uses HAProxy, made for - Swarm by Docker Captian [@vfarcic](https://twitter.com/vfarcic) + Swarm by Docker Captain [@vfarcic](https://twitter.com/vfarcic) ---