Browse Source

Remove caddy

ghorsington 3 years ago
parent
commit
8f71bab9b7
4 changed files with 3 additions and 26 deletions
  1. 0 2
      .env.template
  2. 1 7
      docker-compose.dev.yml
  3. 2 13
      docker-compose.yml
  4. 0 4
      web_config/Caddyfile

+ 0 - 2
.env.template

@@ -18,8 +18,6 @@ GMAIL_NAME=
 GMAIL_PASSWORD=
 ERRORS_ADDR=
 
-WEB_DOMAIN=
-WEB_OUT_PORT=
 NOCTBOT_ADDR=
 RPC_PORT=
 WEB_COOKIE_KEY=

+ 1 - 7
docker-compose.dev.yml

@@ -11,10 +11,4 @@ services:
 
   facedetect:
     ports:
-      - 8081:80
-
-  caddy:
-    ports:
-      - "3000:80"
-    environment:
-      DOMAINS: "localhost:80"
+      - 8081:80

+ 2 - 13
docker-compose.yml

@@ -34,19 +34,6 @@ services:
       dockerfile: ./facedetect/Dockerfile
     restart: unless-stopped
 
-  caddy:
-    image: caddy
-    depends_on: 
-      - web
-    ports:
-      - "${WEB_OUT_PORT}:443"
-    environment:
-      DOMAINS: "${WEB_DOMAIN}:443"
-    volumes:
-      - caddy-data:/data
-      - caddy-config:/config
-      - ./web_config/Caddyfile:/etc/caddy/Caddyfile
-
   web:
     image: noctbot_web
     build:
@@ -59,6 +46,8 @@ services:
     env_file:
       - .env
       - db.env
+    ports: 
+      - "9191:80"
     environment:
       NODE_ENV: production
       TYPEORM_USERNAME: ${DB_USERNAME}

+ 0 - 4
web_config/Caddyfile

@@ -1,4 +0,0 @@
-
-{$DOMAINS} {
-    reverse_proxy http://web:80
-}