From 347f781cf68c436795a0976456af7fa40f5f9473 Mon Sep 17 00:00:00 2001 From: sirius Date: Mon, 24 Aug 2026 17:58:50 -0400 Subject: [PATCH] =?UTF-8?q?CI:=20fix=20deploy=20failures=20=E2=80=94=20pin?= =?UTF-8?q?=20compose=20project=20name=20in=20docker-compose.yml,=20drop?= =?UTF-8?q?=20COMPOSE=5FPROJECT=5FNAME=3Dosint=20override=20(would=20orpha?= =?UTF-8?q?n=20osint-dashboard=5Fosint-pgdata);=20runner=20now=20mounts=20?= =?UTF-8?q?cli-plugins=20so=20'docker=20compose'=20works=20in=20job=20cont?= =?UTF-8?q?ainers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/build.yml | 10 +++++----- docker-compose.yml | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index f558b6e..d5a61e2 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -9,19 +9,19 @@ jobs: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 - name: Build and deploy on the Pi (local docker) - env: - # force a stable compose project name so container names stay - # consistent (osint-app, osint-db, ...) regardless of checkout path - COMPOSE_PROJECT_NAME: osint run: | set -ex # The forgejo-runner runs on the Pi with /var/run/docker.sock and # /opt/siriusdevops mounted, so we build + deploy LOCALLY — no SSH/scp. # Deploy straight from the checked-out workspace. cd "${GITHUB_WORKSPACE}" + # Project name is pinned by `name:` in docker-compose.yml + # (osint-dashboard), matching the live volume + # osint-dashboard_osint-pgdata. Do NOT override COMPOSE_PROJECT_NAME + # here — a different name would create a fresh empty pgdata volume. docker compose build --no-cache docker compose up -d --force-recreate docker image prune -f echo 'osint-dashboard deployed (local)' -# deployed locally on the Pi via runner (docker socket + /opt/siriusdevops mounted) +# deployed locally on the Pi via runner (docker socket + cli-plugins mounted) diff --git a/docker-compose.yml b/docker-compose.yml index dfa4d07..4d83854 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,11 @@ # Bring up: docker compose up -d # With NATS: docker compose --profile ingest up -d # Env: copy .env.example to .env and adjust. +# +# Project name is pinned here (NOT via COMPOSE_PROJECT_NAME in CI) so the +# named volumes stay osint-dashboard_osint-pgdata / _camera-snapshots and +# match the live stack on the Pi. +name: osint-dashboard services: db: