Skip to content

Commit 88bee63

Browse files
committed
feat(server): Start local dev pg under docker compose project endign with dev
1 parent 8c23cef commit 88bee63

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

‎server/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ AGENT_CONTROL_HOST ?= 0.0.0.0
1111
AGENT_CONTROL_PORT ?= 8000
1212
AGENT_CONTROL_DB_PORT ?= 5432
1313
AGENT_CONTROL_DB_HOST_PORT ?= $(AGENT_CONTROL_DB_PORT)
14+
AGENT_CONTROL_DOCKER_COMPOSE_PROJECT_NAME ?= $(notdir $(or $(PWD),$(CURDIR)))-dev
1415

1516
TEST_DB ?= agent_control_test
1617
TEST_DB_ENV := env -u AGENT_CONTROL_DB_URL -u DATABASE_URL -u DB_URL AGENT_CONTROL_DB_HOST=localhost AGENT_CONTROL_DB_PORT=5432 AGENT_CONTROL_DB_USER=agent_control AGENT_CONTROL_DB_PASSWORD=agent_control AGENT_CONTROL_DB_DATABASE=$(TEST_DB) AGENT_CONTROL_DB_DRIVER=psycopg
@@ -20,7 +21,7 @@ help:
2021
@echo "Available targets:"
2122
@echo " run - start FastAPI server (reload; honors AGENT_CONTROL_HOST/AGENT_CONTROL_PORT)"
2223
@echo " local Postgres host mapping defaults to AGENT_CONTROL_DB_PORT"
23-
@echo " start-dependencies - docker compose up -d (start local dependencies)"
24+
@echo " start-dependencies - docker compose up -d (start local dependencies; project=$(AGENT_CONTROL_DOCKER_COMPOSE_PROJECT_NAME))"
2425
@echo " test - run server tests (uses $(TEST_DB_ENV))"
2526
@echo " migrate - run database migrations (alembic upgrade head)"
2627
@echo " alembic-migrate MSG='message' - autogenerate alembic revision"
@@ -61,9 +62,9 @@ alembic-stamp:
6162
$(ALEMBIC) stamp $(STAMP)
6263

6364
start-dependencies:
64-
AGENT_CONTROL_DB_HOST_PORT=$(AGENT_CONTROL_DB_HOST_PORT) docker compose -f ../docker-compose.dev.yml up -d
65+
AGENT_CONTROL_DB_HOST_PORT=$(AGENT_CONTROL_DB_HOST_PORT) docker compose -p $(AGENT_CONTROL_DOCKER_COMPOSE_PROJECT_NAME) -f ../docker-compose.dev.yml up -d
6566
@echo "Waiting for PostgreSQL to be ready..."
66-
@until docker compose -f ../docker-compose.dev.yml exec -T postgres pg_isready -U agent_control -d agent_control > /dev/null 2>&1; do \
67+
@until docker compose -p $(AGENT_CONTROL_DOCKER_COMPOSE_PROJECT_NAME) -f ../docker-compose.dev.yml exec -T postgres pg_isready -U agent_control -d agent_control > /dev/null 2>&1; do \
6768
sleep 1; \
6869
done
6970
@echo "PostgreSQL is ready!"

0 commit comments

Comments
 (0)