fix: bake SCANNER_SERVICE_URL into the combined image
Some checks failed
CI / Detect changes (push) Has been cancelled
CI / API Lint (push) Has been cancelled
CI / API Tests (push) Has been cancelled
CI / Scanner Lint (push) Has been cancelled
CI / Scanner Tests (push) Has been cancelled
CI / Banner Lint & Typecheck (push) Has been cancelled
CI / Banner Tests (push) Has been cancelled
CI / Banner Build (push) Has been cancelled
CI / Admin UI Typecheck (push) Has been cancelled
CI / Admin UI Tests (push) Has been cancelled
CI / Admin UI Build (push) Has been cancelled
Some checks failed
CI / Detect changes (push) Has been cancelled
CI / API Lint (push) Has been cancelled
CI / API Tests (push) Has been cancelled
CI / Scanner Lint (push) Has been cancelled
CI / Scanner Tests (push) Has been cancelled
CI / Banner Lint & Typecheck (push) Has been cancelled
CI / Banner Tests (push) Has been cancelled
CI / Banner Build (push) Has been cancelled
CI / Admin UI Typecheck (push) Has been cancelled
CI / Admin UI Tests (push) Has been cancelled
CI / Admin UI Build (push) Has been cancelled
Bake SCANNER_SERVICE_URL=http://127.0.0.1:8001 and PYTHONUNBUFFERED=1 into /etc/profile.d/consentos.sh inside the image and source that file from /entrypoint.sh so every supervisord child (api, worker, beat, scanner) inherits the same defaults — both for EasyPanel deploys and local docker compose. Drop the inline env injection in supervisord.conf since the entrypoint now sets it. Single source of truth: the Dockerfile.
This commit is contained in:
@@ -1,6 +1,13 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# Source runtime defaults baked into the image so supervisord's children
|
||||
# (api, worker, beat, scanner) inherit them. Variables already set in the
|
||||
# environment take precedence — easy panel / docker compose overrides win.
|
||||
for f in /etc/profile.d/*.sh; do
|
||||
[ -r "$f" ] && . "$f"
|
||||
done
|
||||
|
||||
# Extract host and port from DATABASE_URL
|
||||
DB_HOST=$(echo "$DATABASE_URL" | sed -E 's|.*@([^/:]+).*|\1|')
|
||||
DB_PORT=$(echo "$DATABASE_URL" | sed -E 's|.*@[^/:]+:([0-9]+)/.*|\1|')
|
||||
|
||||
Reference in New Issue
Block a user