From 1750efeb05fd79f5c536647890c61ada588e2c60 Mon Sep 17 00:00:00 2001 From: constantprojects Date: Tue, 24 Feb 2026 11:59:30 -0700 Subject: [PATCH] Fix gitignore blocking deploy override from being tracked The pattern docker-compose.override.yml matched at all levels, preventing website/deploy/docker-compose.override.yml from being committed. Changed to /docker-compose.override.yml (root-only). Co-Authored-By: Claude Opus 4.6 --- .gitignore | 2 +- website/deploy/docker-compose.override.yml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 website/deploy/docker-compose.override.yml diff --git a/.gitignore b/.gitignore index d5fc732..dcb7bec 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ .credentials # Docker Compose override (used for marketing site on production VPS only) -docker-compose.override.yml +/docker-compose.override.yml website/deploy/active-marketing.conf # Persistent data (created by setup.sh) diff --git a/website/deploy/docker-compose.override.yml b/website/deploy/docker-compose.override.yml new file mode 100644 index 0000000..284a772 --- /dev/null +++ b/website/deploy/docker-compose.override.yml @@ -0,0 +1,11 @@ +# Marketing site overlay — adds the static marketing site to the nginx container +# This file is auto-merged by Docker Compose when placed in the project root. +# It does NOT modify any core WebsiteBox files. +# +# Usage: cp website/deploy/docker-compose.override.yml . && docker compose up -d + +services: + nginx: + volumes: + - ./website:/var/www/marketing:ro + - ./website/deploy/active-marketing.conf:/etc/nginx/conf.d/marketing.conf:ro