From dda123b80332e3c170a8d223015e64f44fc06be6 Mon Sep 17 00:00:00 2001 From: pguerrerox Date: Fri, 1 May 2026 01:14:21 +0000 Subject: [PATCH] chore: align deployment environment config --- .env.example | 9 +++++++++ CHANGELOG.md | 4 ++++ docker-compose.yml | 16 ++++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.env.example b/.env.example index 42415f3..d5edc82 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,12 @@ +# App runtime +NODE_ENV="development" + # Frontend env vars for the Vite app VITE_API_BASE_URL="http://localhost:4000/api" VITE_GOOGLE_MAPS_PLATFORM_KEY="YOUR_BROWSER_MAPS_KEY" # Local backend env vars +# If your password contains special characters, URL-encode it in DATABASE_URL. DATABASE_URL="postgres://postgres:postgres@localhost:5432/leads4less" COOKIE_SECRET="CHANGE_ME_IN_LOCAL_ENV" APP_HOST="0.0.0.0" @@ -11,3 +15,8 @@ APP_ORIGIN="http://localhost:3000" PG_BOSS_SCHEMA="pgboss" SESSION_TTL_DAYS="30" GOOGLE_MAPS_SERVER_KEY="YOUR_SERVER_MAPS_KEY" + +# Docker Compose database env vars +POSTGRES_DB="leads4less" +POSTGRES_USER="postgres" +POSTGRES_PASSWORD="CHANGE_ME_IN_LOCAL_ENV" diff --git a/CHANGELOG.md b/CHANGELOG.md index 50f0d11..273c2e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Added - Added a multi-stage `Dockerfile` and `docker-compose.yml` for running the web app, API, worker, and PostGIS database as a local container stack. +### Changed +- Updated the Docker Compose deployment config to read app secrets and Vite build settings from environment variables, and added a `.dockerignore` to keep container builds leaner. +- Aligned the Docker Compose and example environment settings so local and deployment configs use the same variable names and document URL-encoded database passwords when needed. + ## [2026-04-19] ### Added diff --git a/docker-compose.yml b/docker-compose.yml index 0de6045..094165e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,8 @@ services: db: image: postgis/postgis:16-3.4 environment: - POSTGRES_DB: leads4less - POSTGRES_USER: postgres + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} volumes: - leads4less-db:/var/lib/postgresql/data @@ -16,16 +16,16 @@ services: - db environment: NODE_ENV: ${NODE_ENV} - APP_HOST: 0.0.0.0 - APP_PORT: 4000 - APP_ORIGIN: https://l4l.duramente.com + APP_HOST: ${APP_HOST} + APP_PORT: ${APP_PORT} + APP_ORIGIN: ${APP_ORIGIN} DATABASE_URL: ${DATABASE_URL} COOKIE_SECRET: ${COOKIE_SECRET} GOOGLE_MAPS_SERVER_KEY: ${GOOGLE_MAPS_SERVER_KEY} PG_BOSS_SCHEMA: ${PG_BOSS_SCHEMA} - SESSION_TTL_DAYS: 30 + SESSION_TTL_DAYS: ${SESSION_TTL_DAYS} expose: - - "4000" + - ${APP_PORT} worker: build: @@ -39,7 +39,7 @@ services: COOKIE_SECRET: ${COOKIE_SECRET} GOOGLE_MAPS_SERVER_KEY: ${GOOGLE_MAPS_SERVER_KEY} PG_BOSS_SCHEMA: ${PG_BOSS_SCHEMA} - SESSION_TTL_DAYS: 30 + SESSION_TTL_DAYS: ${SESSION_TTL_DAYS} web: build: