Skip to content

Commit

Permalink
Merge pull request #284 from COS301-SE-2024/fix/backend/Fix-config
Browse files Browse the repository at this point in the history
Centrifugo disabled for now
  • Loading branch information
Rethakgetse-Manaka committed Aug 7, 2024
2 parents d9eca4c + f29c60c commit f0dd515
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 77 deletions.
42 changes: 21 additions & 21 deletions occupi-backend/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ services:
depends_on:
rabbitmq-dev:
condition: service_healthy
centrifugo-dev:
condition: service_healthy
# centrifugo-dev:
# condition: service_healthy

rabbitmq-dev:
image: rabbitmq:latest
Expand All @@ -42,28 +42,28 @@ services:
timeout: 30s
retries: 3

centrifugo-dev:
image: centrifugo/centrifugo:v5
container_name: centrifugo-dev
volumes:
- ./configs/config.json:/centrifugo/config.json
- centrifugo-dev:/centrifugo/data
command: centrifugo -c config.json --health
ports:
- 8001:8000
ulimits:
nofile:
soft: 262144
hard: 262144
healthcheck:
test: curl -f http://localhost:8001/health
interval: 30s
timeout: 10s
retries: 5
# centrifugo-dev:
# image: centrifugo/centrifugo:v5
# container_name: centrifugo-dev
# volumes:
# - ./configs/config.json:/centrifugo/config.json
# - centrifugo-dev:/centrifugo/data
# command: centrifugo -c config.json --health
# ports:
# - 8001:8000
# ulimits:
# nofile:
# soft: 262144
# hard: 262144
# healthcheck:
# test: curl -f http://localhost:8001/health
# interval: 30s
# timeout: 10s
# retries: 5

volumes:
rabbitmq-dev:
centrifugo-dev:
# centrifugo-dev:

networks:
webnet:
Expand Down
38 changes: 19 additions & 19 deletions occupi-backend/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ services:
volumes:
- rabbitmq-dev-local-local:/var/lib/rabbitmq

centrifugo-dev-local-local:
image: centrifugo/centrifugo:v5
container_name: centrifugo-dev-local-local
volumes:
- ./configs/config.json:/centrifugo/config.json
- centrifugo-dev-local-local:/centrifugo/data
command: centrifugo -c config.json --health
ports:
- 8001:8000
ulimits:
nofile:
soft: 262144
hard: 262144
healthcheck:
test: curl -f http://localhost:8001/health
interval: 30s
timeout: 10s
retries: 5
# centrifugo-dev-local-local:
# image: centrifugo/centrifugo:v5
# container_name: centrifugo-dev-local-local
# volumes:
# - ./configs/config.json:/centrifugo/config.json
# - centrifugo-dev-local-local:/centrifugo/data
# command: centrifugo -c config.json --health
# ports:
# - 8001:8000
# ulimits:
# nofile:
# soft: 262144
# hard: 262144
# healthcheck:
# test: curl -f http://localhost:8001/health
# interval: 30s
# timeout: 10s
# retries: 5

volumes:
rabbitmq-dev-local-local:
centrifugo-dev-local-local:
# centrifugo-dev-local-local:
38 changes: 19 additions & 19 deletions occupi-backend/docker-compose.localdev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@ services:
timeout: 30s
retries: 3

centrifugo-dev-local:
image: centrifugo/centrifugo:v5
container_name: centrifugo-dev-local
volumes:
- ./configs/config.json:/centrifugo/config.json
- centrifugo-dev-local:/centrifugo/data
command: centrifugo -c config.json --health
ports:
- 8001:8000
ulimits:
nofile:
soft: 262144
hard: 262144
healthcheck:
test: curl -f http://localhost:8001/health
interval: 30s
timeout: 10s
retries: 5
# centrifugo-dev-local:
# image: centrifugo/centrifugo:v5
# container_name: centrifugo-dev-local
# volumes:
# - ./configs/config.json:/centrifugo/config.json
# - centrifugo-dev-local:/centrifugo/data
# command: centrifugo -c config.json --health
# ports:
# - 8001:8000
# ulimits:
# nofile:
# soft: 262144
# hard: 262144
# healthcheck:
# test: curl -f http://localhost:8001/health
# interval: 30s
# timeout: 10s
# retries: 5

volumes:
rabbitmq-dev-local:
centrifugo-dev-local:
# centrifugo-dev-local:
36 changes: 18 additions & 18 deletions occupi-backend/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,24 @@ services:
timeout: 30s
retries: 3

centrifugo-prod:
image: centrifugo/centrifugo:v5
container_name: centrifugo-prod
volumes:
- ./configs/config.json:/centrifugo/config.json
- centrifugo-prod:/centrifugo/data
command: centrifugo -c config.json --health
ports:
- 8001:8000
ulimits:
nofile:
soft: 262144
hard: 262144
healthcheck:
test: curl -f http://localhost:8001/health
interval: 30s
timeout: 10s
retries: 5
# centrifugo-prod:
# image: centrifugo/centrifugo:v5
# container_name: centrifugo-prod
# volumes:
# - ./configs/config.json:/centrifugo/config.json
# - centrifugo-prod:/centrifugo/data
# command: centrifugo -c config.json --health
# ports:
# - 8001:8000
# ulimits:
# nofile:
# soft: 262144
# hard: 262144
# healthcheck:
# test: curl -f http://localhost:8001/health
# interval: 30s
# timeout: 10s
# retries: 5

volumes:
mongo-prod:
Expand Down

0 comments on commit f0dd515

Please sign in to comment.