From b1829a94e897bae4bf628fef2ef77c22f313e6ad Mon Sep 17 00:00:00 2001
From: Malfurious <m@lfurio.us>
Date: Tue, 16 Aug 2022 04:36:51 -0400
Subject: Clean up docker-compose

Proxy containers are updated to use the images from the nginxproxy
project.  Extra bits of configuration are updated using the instructions
from those repositories.

The external 'net' network is removed, as all services will eventually
be defined in this file.

Signed-off-by: Malfurious <m@lfurio.us>
---
 docker-compose.yml | 70 +++++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7ac3eb9..3b7ca0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,45 +1,39 @@
 version: "3.7"
 
 services:
+  nginx-proxy:
+    container_name: "nginx-proxy"
+    image: "nginxproxy/nginx-proxy"
+    volumes:
+      - "certs:/etc/nginx/certs"
+      - "dhparam:/etc/nginx/dhparam"
+      - "vhost:/etc/nginx/vhost.d"
+      - "html:/usr/share/nginx/html"
+      - "/var/run/docker.sock:/tmp/docker.sock:ro"
+    restart: "always"
+    ports:
+      - "80:80"
+      - "443:443"
+
+  acme-companion:
+    container_name: "acme-companion"
+    image: "nginxproxy/acme-companion"
+    depends_on:
+      - "nginx-proxy"
+    volumes:
+      - "acme:/etc/acme.sh"
+      - "certs:/etc/nginx/certs"
+      - "dhparam:/etc/nginx/dhparam"
+      - "vhost:/etc/nginx/vhost.d"
+      - "html:/usr/share/nginx/html"
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+    environment:
+      NGINX_PROXY_CONTAINER: "nginx-proxy"
+    restart: "always"
 
-    reverse-proxy:
-        image: "jwilder/nginx-proxy:latest"
-        container_name: "reverse-proxy"
-        volumes:
-            - "html:/usr/share/nginx/html"
-            - "dhparam:/etc/nginx/dhparam"
-            - "vhost:/etc/nginx/vhost.d"
-            - "certs:/etc/nginx/certs"
-            - "/run/docker.sock:/tmp/docker.sock:ro"
-        restart: "always"
-        networks: 
-            - "net"
-        ports:
-            - "80:80"
-            - "443:443"
-    letsencrypt:
-        image: "jrcs/letsencrypt-nginx-proxy-companion:latest"
-        container_name: "letsencrypt-helper"
-        volumes:
-            - "html:/usr/share/nginx/html"
-            - "dhparam:/etc/nginx/dhparam"
-            - "vhost:/etc/nginx/vhost.d"
-            - "certs:/etc/nginx/certs"
-            - "/run/docker.sock:/var/run/docker.sock:ro"
-        environment:
-            NGINX_PROXY_CONTAINER: "reverse-proxy"
-            DEFAULT_EMAIL: "user@domain.com"
-        restart: "always"
-        depends_on:
-            - "reverse-proxy"
-        networks: 
-            - "net"
 volumes:
+  acme:
   certs:
-  html:
-  vhost:
   dhparam:
-
-networks:
-  net:
-    external: true
+  vhost:
+  html:
-- 
cgit v1.2.3