From 5f684d4fc5b5466f351492e94fc0c4279c9b6750 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Mon, 27 Jun 2016 01:26:39 -0400
Subject: [PATCH 1/2] Add docker-compose file for separate containers.

Demonstrate that this pattern works.

This is based on the example at
<https://github.com/fatk/docker-letsencrypt-nginx-proxy-companion-examples/blob/master/docker-compose/v2/simple-site/docker-compose.yml>.
---
 README.md                              | 10 +++++++-
 docker-compose-separate-containers.yml | 33 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 docker-compose-separate-containers.yml

diff --git a/README.md b/README.md
index b12c9c2..0a9fe79 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ services:
 ```shell
 $ docker-compose up
 $ curl -H "Host: whoami.local" localhost
-I''m 5b129ab83266
+I'm 5b129ab83266
 ```
 
 ### Multiple Ports
@@ -92,6 +92,14 @@ image and the official [nginx](https://registry.hub.docker.com/_/nginx/) image.
 
 You may want to do this to prevent having the docker socket bound to a publicly exposed container service.
 
+You can demo this pattern with docker-compose:
+
+```console
+$ docker-compose --file docker-compose-separate-containers.yml up
+$ curl -H "Host: whoami.local" localhost
+I'm 5b129ab83266
+```
+
 To run nginx proxy as a separate container you'll need to have [nginx.tmpl](https://github.com/jwilder/nginx-proxy/blob/master/nginx.tmpl) on your host system.
 
 First start nginx with a volume:
diff --git a/docker-compose-separate-containers.yml b/docker-compose-separate-containers.yml
new file mode 100644
index 0000000..dc41c01
--- /dev/null
+++ b/docker-compose-separate-containers.yml
@@ -0,0 +1,33 @@
+version: '2'
+services:
+  nginx:
+    image: nginx
+    container_name: nginx
+    ports:
+      - "80:80"
+    volumes:
+      - /etc/nginx/conf.d
+    networks:
+      - proxy-tier
+
+  dockergen:
+    image: jwilder/docker-gen
+    command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    volumes_from:
+      - nginx
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
+    networks:
+      - proxy-tier
+
+  whoami:
+    image: jwilder/whoami
+    environment:
+      - VIRTUAL_HOST=whoami.local
+    networks:
+      - proxy-tier
+
+networks:
+  proxy-tier:
+    driver: bridge

From 478ad17adb59808fecdaf1b7076d938460ba0108 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Fri, 29 Jul 2016 17:23:10 -0400
Subject: [PATCH 2/2] Remove proxy-tier network in favor of the default.

As @huiwang pointed out, using a custom network is unnecessary since the
default bridge network works just as well.
---
 docker-compose-separate-containers.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/docker-compose-separate-containers.yml b/docker-compose-separate-containers.yml
index dc41c01..a4edb94 100644
--- a/docker-compose-separate-containers.yml
+++ b/docker-compose-separate-containers.yml
@@ -7,8 +7,6 @@ services:
       - "80:80"
     volumes:
       - /etc/nginx/conf.d
-    networks:
-      - proxy-tier
 
   dockergen:
     image: jwilder/docker-gen
@@ -18,16 +16,8 @@ services:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
-    networks:
-      - proxy-tier
 
   whoami:
     image: jwilder/whoami
     environment:
       - VIRTUAL_HOST=whoami.local
-    networks:
-      - proxy-tier
-
-networks:
-  proxy-tier:
-    driver: bridge