From f02b6ca886f59a03a72f35448de606d15dd257de Mon Sep 17 00:00:00 2001 From: Joyce <26967919+Joyce-O@users.noreply.github.com> Date: Wed, 21 Jan 2026 15:17:50 -0500 Subject: [PATCH] chore: rename compose files - production as default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - docker-compose.yml → production (Coolify default) - docker-compose.dev.yml → local development Co-Authored-By: Claude Opus 4.5 --- docker-compose.dev.yml | 50 +++++++++++++++++++++++++++++++++++++++++ docker-compose.prod.yml | 48 --------------------------------------- docker-compose.yml | 40 ++++++++++++++++----------------- 3 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 docker-compose.dev.yml delete mode 100644 docker-compose.prod.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..441185d --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,50 @@ +services: + db: + image: postgres:16-alpine + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: availability + volumes: + - postgres_data:/var/lib/postgresql/data + ports: + - "5433:5432" + healthcheck: + test: ["CMD-SHELL", "pg_isready -U postgres"] + interval: 5s + timeout: 5s + retries: 5 + + backend: + build: + context: ./backend + dockerfile: Dockerfile + environment: + DATABASE_URL: postgresql+asyncpg://postgres:postgres@db:5432/availability + SYNC_DATABASE_URL: postgresql://postgres:postgres@db:5432/availability + env_file: + - .env + ports: + - "8001:8000" + depends_on: + db: + condition: service_healthy + volumes: + - ./backend/src:/app/src + - ./backend/alembic:/app/alembic + + frontend: + build: + context: ./frontend + dockerfile: Dockerfile + ports: + - "5174:8080" + environment: + VITE_API_URL: http://localhost:8001 + depends_on: + - backend + volumes: + - ./frontend/src:/app/src + +volumes: + postgres_data: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml deleted file mode 100644 index f96e885..0000000 --- a/docker-compose.prod.yml +++ /dev/null @@ -1,48 +0,0 @@ -services: - db: - image: postgres:16-alpine - environment: - POSTGRES_USER: ${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?POSTGRES_PASSWORD required} - POSTGRES_DB: ${POSTGRES_DB:-availability} - volumes: - - postgres_data:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 5s - timeout: 5s - retries: 5 - restart: unless-stopped - - backend: - build: - context: ./backend - dockerfile: Dockerfile - environment: - DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-availability} - SYNC_DATABASE_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-availability} - SMTP_HOST: ${SMTP_HOST:-} - SMTP_PORT: ${SMTP_PORT:-587} - SMTP_USER: ${SMTP_USER:-} - SMTP_PASSWORD: ${SMTP_PASSWORD:-} - ZULIP_SITE: ${ZULIP_SITE:-} - ZULIP_EMAIL: ${ZULIP_EMAIL:-} - ZULIP_API_KEY: ${ZULIP_API_KEY:-} - ZULIP_STREAM: ${ZULIP_STREAM:-general} - depends_on: - db: - condition: service_healthy - restart: unless-stopped - - frontend: - build: - context: ./frontend - dockerfile: Dockerfile.prod - args: - VITE_API_URL: ${VITE_API_URL:-} - depends_on: - - backend - restart: unless-stopped - -volumes: - postgres_data: diff --git a/docker-compose.yml b/docker-compose.yml index 441185d..f96e885 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,49 +2,47 @@ services: db: image: postgres:16-alpine environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - POSTGRES_DB: availability + POSTGRES_USER: ${POSTGRES_USER:-postgres} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?POSTGRES_PASSWORD required} + POSTGRES_DB: ${POSTGRES_DB:-availability} volumes: - postgres_data:/var/lib/postgresql/data - ports: - - "5433:5432" healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 5s timeout: 5s retries: 5 + restart: unless-stopped backend: build: context: ./backend dockerfile: Dockerfile environment: - DATABASE_URL: postgresql+asyncpg://postgres:postgres@db:5432/availability - SYNC_DATABASE_URL: postgresql://postgres:postgres@db:5432/availability - env_file: - - .env - ports: - - "8001:8000" + DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-availability} + SYNC_DATABASE_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-availability} + SMTP_HOST: ${SMTP_HOST:-} + SMTP_PORT: ${SMTP_PORT:-587} + SMTP_USER: ${SMTP_USER:-} + SMTP_PASSWORD: ${SMTP_PASSWORD:-} + ZULIP_SITE: ${ZULIP_SITE:-} + ZULIP_EMAIL: ${ZULIP_EMAIL:-} + ZULIP_API_KEY: ${ZULIP_API_KEY:-} + ZULIP_STREAM: ${ZULIP_STREAM:-general} depends_on: db: condition: service_healthy - volumes: - - ./backend/src:/app/src - - ./backend/alembic:/app/alembic + restart: unless-stopped frontend: build: context: ./frontend - dockerfile: Dockerfile - ports: - - "5174:8080" - environment: - VITE_API_URL: http://localhost:8001 + dockerfile: Dockerfile.prod + args: + VITE_API_URL: ${VITE_API_URL:-} depends_on: - backend - volumes: - - ./frontend/src:/app/src + restart: unless-stopped volumes: postgres_data: