Browse Source

Initial caddy

ghorsington 3 years ago
parent
commit
bed534e1ae
3 changed files with 17 additions and 4 deletions
  1. 1 1
      Makefile
  2. 2 0
      caddy_config/Caddyfile
  3. 14 3
      docker-compose.yml

+ 1 - 1
Makefile

@@ -21,7 +21,7 @@ start_env: build
 	$(dc) up db adminer facedetect
 
 start: build
-	$(dc) up db adminer noctbot web facedetect
+	$(dc) up db adminer noctbot web facedetect caddy
 
 start_bot: build
 	$(dc) up db adminer noctbot facedetect

+ 2 - 0
caddy_config/Caddyfile

@@ -0,0 +1,2 @@
+:443
+reverse_proxy web:3000

+ 14 - 3
docker-compose.yml

@@ -34,6 +34,16 @@ services:
       dockerfile: ./facedetect/Dockerfile
     restart: unless-stopped
 
+  caddy:
+    image: caddy
+    volumes:
+      - caddy-data:/data
+      - caddy-config:/config
+      - ./caddy_config/Caddyfile:/etc/caddy/Caddyfile
+    ports: 
+      - "80:80"
+      - "443:443"
+
   web:
     image: noctbot_web
     build:
@@ -41,6 +51,7 @@ services:
       dockerfile: ./web/Dockerfile
     restart: unless-stopped
     depends_on:
+      - caddy
       - db
       - noctbot
     env_file:
@@ -51,8 +62,6 @@ services:
       TYPEORM_USERNAME: ${DB_USERNAME}
       TYPEORM_PASSWORD: ${DB_PASSWORD}
       TYPEORM_DATABASE: ${DB_NAME}
-    ports:
-      - 3020:3000
     volumes:
       - web-data:/web_data
 
@@ -75,4 +84,6 @@ services:
 
 volumes:
   db-data:
-  web-data:
+  web-data:
+  caddy-data:
+  caddy-config: