From 0201ea31f4fa00d2de8b68a2bfe84eef34b8897d Mon Sep 17 00:00:00 2001
From: Lejo <Lejo_1@web.de>
Date: Fri, 14 Jan 2022 11:35:13 +0100
Subject: [PATCH] Revert volumes_from (#1677)

Signed-off-by: Lejo1 <Lejo_1@web.de>
---
 .../with-nginx-proxy/mariadb/apache/docker-compose.yml    | 8 +++++---
 .../with-nginx-proxy/mariadb/fpm/docker-compose.yml       | 8 +++++---
 .../with-nginx-proxy/postgres/apache/docker-compose.yml   | 8 +++++---
 .../with-nginx-proxy/postgres/fpm/docker-compose.yml      | 8 +++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

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 504f3021..84e91a41 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
@@ -52,6 +52,8 @@ services:
     ports:
       - 80:80
       - 443:443
+    labels:
+      com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
       - vhost.d:/etc/nginx/vhost.d
@@ -63,11 +65,11 @@ services:
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
-    volumes_from:
-      - proxy
     volumes:
-      - certs:/etc/nginx/certs:rw
+      - certs:/etc/nginx/certs
       - acme:/etc/acme.sh
+      - vhost.d:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
       - proxy-tier
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 8f6b7f1a..33b3d92b 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
@@ -61,6 +61,8 @@ services:
     ports:
       - 80:80
       - 443:443
+    labels:
+      com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
       - vhost.d:/etc/nginx/vhost.d
@@ -72,11 +74,11 @@ services:
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
-    volumes_from:
-      - proxy
     volumes:
-      - certs:/etc/nginx/certs:rw
+      - certs:/etc/nginx/certs
       - acme:/etc/acme.sh
+      - vhost.d:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
       - proxy-tier
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 d662a1a8..11b99c5e 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
@@ -49,6 +49,8 @@ services:
     ports:
       - 80:80
       - 443:443
+    labels:
+      com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
       - vhost.d:/etc/nginx/vhost.d
@@ -60,11 +62,11 @@ services:
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
-    volumes_from:
-      - proxy
     volumes:
-      - certs:/etc/nginx/certs:rw
+      - certs:/etc/nginx/certs
       - acme:/etc/acme.sh
+      - vhost.d:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
       - proxy-tier
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 25d0bc07..6e411741 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
@@ -58,6 +58,8 @@ services:
     ports:
       - 80:80
       - 443:443
+    labels:
+      com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
       - vhost.d:/etc/nginx/vhost.d
@@ -69,11 +71,11 @@ services:
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
-    volumes_from:
-      - proxy
     volumes:
-      - certs:/etc/nginx/certs:rw
+      - certs:/etc/nginx/certs
       - acme:/etc/acme.sh
+      - vhost.d:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
       - proxy-tier