From 1eb3ca378aa7118ccea05eee2f0d75ceb824f504 Mon Sep 17 00:00:00 2001
From: cropse <stu0219@hotmail.com>
Date: Wed, 15 Nov 2017 22:50:58 +0800
Subject: [PATCH 1/2] delete volume mount, It append the path of dockerfile
 build.

---
 .../mariadb-cron-redis/apache/docker-compose.yml            | 3 ---
 .../mariadb-cron-redis/fpm/docker-compose.yml               | 3 ---
 .../with-nginx-proxy/mariadb/apache/docker-compose.yml      | 3 ---
 .../with-nginx-proxy/mariadb/fpm/docker-compose.yml         | 3 ---
 .../with-nginx-proxy/postgres/apache/docker-compose.yml     | 3 ---
 .../with-nginx-proxy/postgres/fpm/docker-compose.yml        | 6 +-----
 6 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
index 54da789..dfc4bd8 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
@@ -68,7 +68,6 @@ services:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
@@ -80,7 +79,6 @@ services:
     restart: always
     volumes:
       - certs:/etc/nginx/certs
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -93,7 +91,6 @@ volumes:
   db:
   nextcloud:
   certs:
-  conf.d:
   vhost.d:
   html:
 
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
index 8ed230a..84f87ff 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
@@ -77,7 +77,6 @@ services:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
@@ -89,7 +88,6 @@ services:
     restart: always
     volumes:
       - certs:/etc/nginx/certs
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -102,7 +100,6 @@ volumes:
   db:
   nextcloud:
   certs:
-  conf.d:
   vhost.d:
   html:
 
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
index 45406dc..77eb466 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@@ -40,7 +40,6 @@ services:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
@@ -52,7 +51,6 @@ services:
     restart: always
     volumes:
       - certs:/etc/nginx/certs
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -65,7 +63,6 @@ volumes:
   db:
   nextcloud:
   certs:
-  conf.d:
   vhost.d:
   html:
 
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 7417a66..5831929 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -49,7 +49,6 @@ services:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
@@ -61,7 +60,6 @@ services:
     restart: always
     volumes:
       - certs:/etc/nginx/certs
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -74,7 +72,6 @@ volumes:
   db:
   nextcloud:
   certs:
-  conf.d:
   vhost.d:
   html:
 
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index 1f59469..febd740 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -37,7 +37,6 @@ services:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
@@ -49,7 +48,6 @@ services:
     restart: always
     volumes:
       - certs:/etc/nginx/certs
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -62,7 +60,6 @@ volumes:
   db:
   nextcloud:
   certs:
-  conf.d:
   vhost.d:
   html:
 
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index d929502..804a59b 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -46,7 +46,6 @@ services:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
@@ -58,7 +57,6 @@ services:
     restart: always
     volumes:
       - certs:/etc/nginx/certs
-      - conf.d:/etc/nginx/conf.d
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -71,10 +69,8 @@ volumes:
   db:
   nextcloud:
   certs:
-  conf.d:
   vhost.d:
   html:
 
 networks:
-  proxy-tier:
-
+  proxy-tier:
\ No newline at end of file

From 21eaaec8eeb162133c0f4600e1b9e1c75182cf6a Mon Sep 17 00:00:00 2001
From: cropse <stu0219@hotmail.com>
Date: Wed, 15 Nov 2017 22:53:54 +0800
Subject: [PATCH 2/2] miner fix

---
 .../with-nginx-proxy/postgres/fpm/docker-compose.yml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 804a59b..7403a29 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -73,4 +73,4 @@ volumes:
   html:
 
 networks:
-  proxy-tier:
\ No newline at end of file
+  proxy-tier: