diff --git a/docker/restart.sh b/docker/restart.sh index 16a84c7..b5e1390 100644 --- a/docker/restart.sh +++ b/docker/restart.sh @@ -4,7 +4,7 @@ set -euo pipefail # Script to completely restart the project as requested echo "Stopping and removing containers..." -dc() { (cd "$(dirname "$0")" && docker compose --env-file ../.env -f compose.yaml "$@"); } +dc() { (cd "$(dirname "$0")/.." && docker compose -f docker/compose.yaml "$@"); } dc down --remove-orphans echo "Clearing Docker build cache..." diff --git a/docker/setup.sh b/docker/setup.sh index 22b0b6c..d3880ee 100644 --- a/docker/setup.sh +++ b/docker/setup.sh @@ -27,8 +27,8 @@ else exit 1 fi -# Helper to run docker compose from the docker/ directory -dc() { (cd "$DOCKER_DIR" && $DOCKER_COMPOSE --env-file ../.env -f compose.yaml "$@"); } +# Helper to run docker compose from the project root +dc() { (cd "$ROOT_DIR" && $DOCKER_COMPOSE -f docker/compose.yaml "$@"); } REBUILD=1 RECREATE=0