From 0a7b66296190fd3ab6a6a0d02832b6e9a8f937dc Mon Sep 17 00:00:00 2001 From: Brian Christner Date: Mon, 27 Nov 2017 22:27:47 +0100 Subject: [PATCH] Added @GoogleCloud container-diff Signed-off-by: Brian Christner --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index bde03c5..06a8e16 100644 --- a/README.md +++ b/README.md @@ -234,11 +234,7 @@ Docker EE is on the same code base as Docker CE, so also built from Moby, with c ### Reverse Proxy -<<<<<<< HEAD -* [docker-flow-proxy](https://github.com/vfarcic/docker-flow-proxy) - Reconfigures proxy every time a new service is deployed, or when a service is scaled. By [@vfarcic](https://github.com/vfarcic) -======= * [docker-flow-proxy](https://github.com/vfarcic/docker-flow-proxy) - Reconfigures proxy every time a new service is deployed, or when a service is scaled. By [@vfarcic][vfarcic] ->>>>>>> upstream/master * [docker-proxy](https://github.com/silarsis/docker-proxy) :skull: - Transparent proxy for docker containers, run in a docker container. By [@silarsis](https://github.com/silarsis) * [fabio](https://github.com/fabiolb/fabio) - A fast, modern, zero-conf load balancing HTTP(S) router for deploying microservices managed by consul. By [@magiconair](https://github.com/magiconair) (Frank Schroeder) * [h2o-proxy](https://github.com/zchee/h2o-proxy) :skull: - Automated H2O reverse proxy for Docker containers. An alternative to [jwilder/nginx-proxy][nginxproxy] by [@zchee](https://github.com/zchee)