🔧 chore(docker-compose.override.yml): rename 'queue' service to 'result_backend' for better clarity and consistency
🔧 chore(docker-compose.yml): add 'broker' service for RabbitMQ management console
This commit is contained in:
parent
22391c46eb
commit
d6262b0b86
2 changed files with 28 additions and 13 deletions
|
|
@ -27,7 +27,7 @@ services:
|
||||||
- traefik.http.routers.${STACK_NAME?Variable not set}-traefik-public-http.rule=Host(`${DOMAIN?Variable not set}`)
|
- traefik.http.routers.${STACK_NAME?Variable not set}-traefik-public-http.rule=Host(`${DOMAIN?Variable not set}`)
|
||||||
- traefik.http.services.${STACK_NAME?Variable not set}-traefik-public.loadbalancer.server.port=80
|
- traefik.http.services.${STACK_NAME?Variable not set}-traefik-public.loadbalancer.server.port=80
|
||||||
|
|
||||||
queue:
|
result_backend:
|
||||||
ports:
|
ports:
|
||||||
- "6379:6379"
|
- "6379:6379"
|
||||||
|
|
||||||
|
|
@ -60,6 +60,18 @@ services:
|
||||||
- traefik.http.routers.${STACK_NAME?Variable not set}-celeryworker-http.rule=PathPrefix(`/api/v1`) || PathPrefix(`/docs`) || PathPrefix(`/health`)
|
- traefik.http.routers.${STACK_NAME?Variable not set}-celeryworker-http.rule=PathPrefix(`/api/v1`) || PathPrefix(`/docs`) || PathPrefix(`/health`)
|
||||||
- traefik.http.services.${STACK_NAME?Variable not set}-celeryworker.loadbalancer.server.port=7860
|
- traefik.http.services.${STACK_NAME?Variable not set}-celeryworker.loadbalancer.server.port=7860
|
||||||
|
|
||||||
|
tests:
|
||||||
|
extends:
|
||||||
|
file: docker-compose.yml
|
||||||
|
service: backend
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
build:
|
||||||
|
context: ../
|
||||||
|
dockerfile: base.Dockerfile
|
||||||
|
command: pytest -vv
|
||||||
|
healthcheck:
|
||||||
|
test: "exit 0"
|
||||||
networks:
|
networks:
|
||||||
traefik-public:
|
traefik-public:
|
||||||
# For local dev, don't expect an external Traefik network
|
# For local dev, don't expect an external Traefik network
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ services:
|
||||||
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.tls.certresolver=le
|
- traefik.http.routers.${STACK_NAME?Variable not set}-pgadmin-https.tls.certresolver=le
|
||||||
- traefik.http.services.${STACK_NAME?Variable not set}-pgadmin.loadbalancer.server.port=5050
|
- traefik.http.services.${STACK_NAME?Variable not set}-pgadmin.loadbalancer.server.port=5050
|
||||||
|
|
||||||
queue:
|
result_backend:
|
||||||
image: redis:6.2.5
|
image: redis:6.2.5
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
|
@ -193,6 +193,20 @@ services:
|
||||||
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
|
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
|
||||||
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
|
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
|
||||||
|
|
||||||
|
broker:
|
||||||
|
# RabbitMQ management console
|
||||||
|
image: rabbitmq:3-management
|
||||||
|
environment:
|
||||||
|
- RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER:-admin}
|
||||||
|
- RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS:-admin}
|
||||||
|
volumes:
|
||||||
|
- ./.docker/rabbitmq/etc/:/etc/rabbitmq/
|
||||||
|
- ./.docker/rabbitmq/data/:/var/lib/rabbitmq/
|
||||||
|
- ./.docker/rabbitmq/logs/:/var/log/rabbitmq/
|
||||||
|
ports:
|
||||||
|
- 5672:5672
|
||||||
|
- 15672:15672
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:v2.37.9
|
image: prom/prometheus:v2.37.9
|
||||||
env_file:
|
env_file:
|
||||||
|
|
@ -227,17 +241,6 @@ services:
|
||||||
- traefik.http.routers.${STACK_NAME?Variable not set}-grafana-http.rule=PathPrefix(`/grafana`)
|
- traefik.http.routers.${STACK_NAME?Variable not set}-grafana-http.rule=PathPrefix(`/grafana`)
|
||||||
- traefik.http.services.${STACK_NAME?Variable not set}-grafana.loadbalancer.server.port=3000
|
- traefik.http.services.${STACK_NAME?Variable not set}-grafana.loadbalancer.server.port=3000
|
||||||
|
|
||||||
tests:
|
|
||||||
<<: *backend
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
build:
|
|
||||||
context: ../
|
|
||||||
dockerfile: base.Dockerfile
|
|
||||||
command: pytest -vv
|
|
||||||
healthcheck:
|
|
||||||
test: "exit 0"
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
grafana_data:
|
grafana_data:
|
||||||
app-db-data:
|
app-db-data:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue