From aae70d93b4de4f61589f2818cf8f30a6366da3d9 Mon Sep 17 00:00:00 2001 From: beatz174-bit Date: Mon, 13 Apr 2026 08:49:22 +1000 Subject: [PATCH] Default PROJECT_ROOT to script directory --- services-up.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/services-up.sh b/services-up.sh index b9958c6..712d6cd 100755 --- a/services-up.sh +++ b/services-up.sh @@ -2,21 +2,30 @@ set -euo pipefail -ENV="default-environment.env" -SECRETS="secrets/stack-secrets.env" +SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" +PROJECT_ROOT="${PROJECT_ROOT:-$SCRIPT_DIR}" +ENV="$PROJECT_ROOT/default-environment.env" +SECRETS="$PROJECT_ROOT/secrets/stack-secrets.env" PROJECT="core" FILES=( - -f default-network.yml + -f "$PROJECT_ROOT/default-network.yml" ) while IFS= read -r file; do FILES+=(-f "$file") done < <( - find apps monitoring core \ + find "$PROJECT_ROOT/apps" "$PROJECT_ROOT/monitoring" "$PROJECT_ROOT/core" \ -type f \ \( -name 'docker-compose.yml' -o -name 'docker-compose.yaml' \) \ + 2>/dev/null \ | sort ) -docker compose -p "$PROJECT" --env-file "$ENV" --env-file "$SECRETS" "${FILES[@]}" "$@" +docker compose \ + --project-directory "$PROJECT_ROOT" \ + -p "$PROJECT" \ + --env-file "$ENV" \ + --env-file "$SECRETS" \ + "${FILES[@]}" \ + "$@"