Skip to content

Commit 19dd713

Browse files
committed
[DOP-25148] Fix running both server and consumer without docker
1 parent c5e2b5d commit 19dd713

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ venv-install: ##@Env Install requirements to venv
4646
db: db-start db-upgrade db-partitions ##@DB Prepare database (in docker)
4747

4848
db-start: ##@DB Start database
49-
docker compose up -d --wait db $(DOCKER_COMPOSE_ARGS)
49+
docker compose -f docker-compose.yml up -d --wait db $(DOCKER_COMPOSE_ARGS)
5050

5151
db-revision: ##@DB Generate migration file
5252
${POETRY} run python -m data_rentgen.db.migrations revision --autogenerate $(ARGS)
@@ -66,7 +66,7 @@ db-views: ##@DB Create views
6666
broker: broker-start ##@Broker Prepare broker (in docker)
6767

6868
broker-start: ##Broker Start broker
69-
docker compose -f docker-compose.test.yml --profile consumer up -d --wait $(DOCKER_COMPOSE_ARGS)
69+
docker compose -f docker-compose.yml up -d --wait broker $(DOCKER_COMPOSE_ARGS)
7070

7171

7272
test: test-db test-broker ##@Test Run tests
@@ -86,7 +86,7 @@ test-db-start: ##@TestDB Start database
8686
test-broker: test-broker-start ##@TestBroker Prepare broker (in docker)
8787

8888
test-broker-start: ##@TestBroker Start broker
89-
docker compose -f docker-compose.test.yml --profile consumer up -d --wait $(DOCKER_COMPOSE_ARGS)
89+
docker compose -f docker-compose.test.yml up -d --wait broker $(DOCKER_COMPOSE_ARGS)
9090

9191
test-ci: test-db test-broker ##@Test Run CI tests
9292
${POETRY} run coverage run -m pytest
@@ -100,19 +100,19 @@ test-cleanup: ##@Test Cleanup tests dependencies
100100

101101

102102
dev-server: db-start ##@Application Run development server (without docker)
103-
${POETRY} run python -m data_rentgen.server $(ARGS)
103+
${POETRY} run python -m data_rentgen.server --host 0.0.0.0 --port 8000 $(ARGS)
104104

105105
dev-consumer: db-start broker-start ##@Application Run development broker (without docker)
106-
${POETRY} run python -m data_rentgen.consumer $(ARGS)
106+
${POETRY} run python -m data_rentgen.consumer --host 0.0.0.0 --port 8001 $(ARGS)
107107

108108
prod-build: ##@Application Build docker image
109109
docker build --progress=plain --network=host -t mtsrus/data-rentgen:develop -f ./docker/Dockerfile $(ARGS) .
110110

111111
prod: ##@Application Run production containers
112-
docker compose up -d
112+
docker compose -f docker-compose.yml up -d
113113

114114
prod-cleanup: ##@Application Stop production containers
115-
docker compose down --remove-orphans $(ARGS)
115+
docker compose -f docker-compose.yml down --remove-orphans $(ARGS)
116116

117117

118118
.PHONY: docs

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ services:
5656

5757
consumer:
5858
image: mtsrus/data-rentgen:${BACKEND_IMAGE:-latest}
59-
command: python -m data_rentgen.consumer
59+
command: python -m data_rentgen.consumer --host 0.0.0.0 --port 8000
6060
restart: unless-stopped
6161
env_file: .env.docker
6262
healthcheck:

0 commit comments

Comments
 (0)