changed vol path, proxy, u pdated env files, minor fixes

portainer/docker-compose.yml

@@ -9,8 +9,6 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - "${VOL_PATH:-./config}/portainer:/data"
     restart: always
-    networks:
-      - portainer-net
   
   portainer-agent:
     image: ${PORTAINER_AGENT_IMAGE:-portainer/agent:latest}
@@ -22,5 +20,4 @@ services:
     ports:
       - 9001:9001
     restart: always
-    networks:
-      - portainer-net
+    

portainer/sample-extends.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 networks:
 	portainer-net:
 	external: true
@@ -9,12 +7,13 @@ services:
 		extends:
 			file: ${COOKBOOK}/portainer/docker-compose.yml
 			service: portainer-agent
-		env_file:
-			- .env
+		networks:
+			- portainer-net
 
 	portainer:
 		extends:
 			file: ${COOKBOOK}/portainer/docker-compose.yml
 			service: portainer
-		env_file:
-			- .env
+		networks:
+			- portainer-net
+			- proxy