From 3eaa83d0df2c17bb5e42d0650d26b7c9003df901 Mon Sep 17 00:00:00 2001 From: CJ_Clippy Date: Mon, 14 Jul 2025 13:13:23 -0800 Subject: [PATCH] use stack --- services/our/compose.production.yml | 36 ++++++++++++++++++----------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/services/our/compose.production.yml b/services/our/compose.production.yml index 4420b0b..c0290bd 100644 --- a/services/our/compose.production.yml +++ b/services/our/compose.production.yml @@ -2,14 +2,16 @@ services: - # caddy: - # image: caddy:alpine - # ports: - # - "8081:80" - # volumes: - # - ./public:/srv - # - ./Caddyfile:/etc/caddy/Caddyfile - + caddy: + image: caddy:alpine + ports: + - "80:80" + - "443:443" + volumes: + - ./public:/srv + - ./Caddyfile:/etc/caddy/Caddyfile + networks: + - our postgres: container_name: our-postgres @@ -29,6 +31,8 @@ services: retries: 5 start_period: 10s timeout: 10s + networks: + - our pgadmin: image: dpage/pgadmin4:latest @@ -39,18 +43,24 @@ services: PGADMIN_DISABLE_POSTFIX: true ports: - "5050:5050" + networks: + - our our: - build: - context: . - dockerfile: Dockerfile + image: gitea.futureporn.net/futureporn/our:latest 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: \ No newline at end of file + pgdata: + +networks: + our: \ No newline at end of file