services/our/Caddyfile

@@ -1,4 +1,14 @@
-future.porn:80
+:80
+
+## reverse_proxy /api/* nocodb:8080
+## reverse_proxy /download/* nocodb:8080
+
+## twitch mock api server
+reverse_proxy /mock/* 172.17.0.1:8080
 
 ## fastify server
-reverse_proxy our:5000
+reverse_proxy 172.17.0.1:3000
+
+
+## file_server
+## root * /srv

services/our/compose.production.yml

@@ -2,16 +2,14 @@
 services:
 
 
-  caddy:
+  # caddy:
-    image: caddy:alpine
+  #   image: caddy:alpine
-    ports:
+  #   ports:
-      - "80:80"
+  #     - "8081:80"
-      - "443:443"
+  #   volumes:
-    volumes:
+  #     - ./public:/srv
-      - ./public:/srv
+  #     - ./Caddyfile:/etc/caddy/Caddyfile
-      - ./Caddyfile:/etc/caddy/Caddyfile
+
-    networks:
-      - our
 
   postgres:
     container_name: our-postgres
@@ -31,8 +29,6 @@ services:
       retries: 5
       start_period: 10s
       timeout: 10s
-    networks:
-      - our
 
   pgadmin:
     image: dpage/pgadmin4:latest
@@ -43,24 +39,18 @@ services:
       PGADMIN_DISABLE_POSTFIX: true
     ports:
       - "5050:5050"
-    networks:
-      - our
 
 
   our:
-    image: gitea.futureporn.net/futureporn/our:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
     container_name: our-app
     ports:
       - "5000:5000"
     env_file: .env.production ## @see ./src/config/env.ts for all env var names.
     depends_on:
-      postgres:
+      - postgres
-        condition: service_healthy
-    network:
-      - our 
 
 volumes:
-  pgdata:
+  pgdata:
-
-networks:
-  our: