From bf4b2c7fb5a830f7c027337bb22f72701a24e905 Mon Sep 17 00:00:00 2001
From: Jeremy Douglass <jeremydouglass@gmail.com>
Date: Tue, 31 Jul 2018 00:41:19 -0700
Subject: [PATCH 1/5] docker-cloud.yml: add Docker stack example

Demonstrate a minimal stack with a generic volume, web host, and proxy.

Demonstrates no exposed port on the source server and the need to escape $ values in the HTPASSWD.
---
 docker-cloud.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 docker-cloud.yml

diff --git a/docker-cloud.yml b/docker-cloud.yml
new file mode 100644
index 0000000..c63241e
--- /dev/null
+++ b/docker-cloud.yml
@@ -0,0 +1,27 @@
+version: '3.1'
+
+volumes:
+  web-data:
+
+services:
+
+  web:
+    image: 'nginx'
+    ## instead of an exposed port use FORWARD_PORT below
+    # ports:
+    #   - '80:80'
+    volumes:
+      - web-data:/usr/share/nginx/html:ro
+  
+  auth:
+    image: 'beevelop/nginx-basic-auth'
+    links:
+      - 'web'
+    ports:
+      - '8080:80'
+    environment:
+      - PORT=80
+      - FORWARD_HOST=web
+      - FORWARD_PORT=80
+      ## escape $ with $$ in Docker yml due to variable expansion
+      - HTPASSWD=foo:$$apr1$$odHl5EJN$$KbxMfo86Qdve2FH4owePn.

From 559a290b9b8323999fd90bec051ff72dfb288515 Mon Sep 17 00:00:00 2001
From: Jeremy Douglass <jeremydouglass@gmail.com>
Date: Mon, 6 Aug 2018 18:52:49 -0700
Subject: [PATCH 2/5] drop `links` (ignored in swarm)

---
 docker-cloud.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-cloud.yml b/docker-cloud.yml
index c63241e..880c7ff 100644
--- a/docker-cloud.yml
+++ b/docker-cloud.yml
@@ -15,8 +15,6 @@ services:
   
   auth:
     image: 'beevelop/nginx-basic-auth'
-    links:
-      - 'web'
     ports:
       - '8080:80'
     environment:

From e560ec663cde5364da28e24676923c229529783e Mon Sep 17 00:00:00 2001
From: Jeremy Douglass <jeremydouglass@gmail.com>
Date: Mon, 6 Aug 2018 19:12:20 -0700
Subject: [PATCH 3/5] comments: expand port and pass comments

---
 docker-cloud.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-cloud.yml b/docker-cloud.yml
index 880c7ff..bcba61f 100644
--- a/docker-cloud.yml
+++ b/docker-cloud.yml
@@ -7,7 +7,7 @@ services:
 
   web:
     image: 'nginx'
-    ## instead of an exposed port use FORWARD_PORT below
+    ## instead of an exposed port, use FORWARD_PORT in auth, below
     # ports:
     #   - '80:80'
     volumes:
@@ -22,4 +22,5 @@ services:
       - FORWARD_HOST=web
       - FORWARD_PORT=80
       ## escape $ with $$ in Docker yml due to variable expansion
+      ## example user/pass generated with htpasswd is foo:bar
       - HTPASSWD=foo:$$apr1$$odHl5EJN$$KbxMfo86Qdve2FH4owePn.

From c97795f15cff4f6aeced2dfcdc8890928d69b4d6 Mon Sep 17 00:00:00 2001
From: Jeremy Douglass <jeremydouglass@gmail.com>
Date: Mon, 6 Aug 2018 19:13:33 -0700
Subject: [PATCH 4/5] comments: give simple example instructions for compose
 and swarm

---
 docker-cloud.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker-cloud.yml b/docker-cloud.yml
index bcba61f..048b4d8 100644
--- a/docker-cloud.yml
+++ b/docker-cloud.yml
@@ -1,5 +1,14 @@
 version: '3.1'
 
+# run with docker-compose:
+#
+#     docker-compose -f docker-cloud.yml up
+
+# run with docker swarm:
+#
+#     docker swarm init
+#     docker stack deploy --compose-file docker-cloud.yml authdemo
+
 volumes:
   web-data:
 

From e56128f5f734c6ece2d64a632208f1be2e26d767 Mon Sep 17 00:00:00 2001
From: Jeremy Douglass <jeremydouglass@gmail.com>
Date: Mon, 6 Aug 2018 19:17:16 -0700
Subject: [PATCH 5/5] rename docker-cloud.yml --> docker-stack.yml

following Docker beginner documentation example for `docker stack`
---
 docker-cloud.yml => docker-stack.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename docker-cloud.yml => docker-stack.yml (86%)

diff --git a/docker-cloud.yml b/docker-stack.yml
similarity index 86%
rename from docker-cloud.yml
rename to docker-stack.yml
index 048b4d8..dc4a7fd 100644
--- a/docker-cloud.yml
+++ b/docker-stack.yml
@@ -2,12 +2,12 @@ version: '3.1'
 
 # run with docker-compose:
 #
-#     docker-compose -f docker-cloud.yml up
+#     docker-compose -f docker-stack.yml up
 
 # run with docker swarm:
 #
 #     docker swarm init
-#     docker stack deploy --compose-file docker-cloud.yml authdemo
+#     docker stack deploy --compose-file docker-stack.yml authdemo
 
 volumes:
   web-data: