Skip to content

Commit

Permalink
Merge pull request #3 from phoenixlan/feature/mailgun-rabbitmq
Browse files Browse the repository at this point in the history
Add mail worker and rabbitmq to docker-compose
  • Loading branch information
petterroea authored Aug 27, 2023
2 parents ea79324 + 593749e commit 90440fc
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.env
.db_env
.npm_env
.participate_env
.mailgun_env
.rabbitmq_env
.fa_env

phoenix-development/files
40 changes: 39 additions & 1 deletion phoenix-development/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ services:
HOST: "http://delta.dev.phoenixlan.no:3000"
REACT_APP_OAUTH_CLIENT_ID: "phoenix-delta-dev"
REACT_APP_MAIN_SITE: "http://dev.phoenixlan.no:3000"
env_file: .participate_env
entrypoint:
- bash
- "-c"
Expand Down Expand Up @@ -56,17 +57,38 @@ services:
logging:
options:
max-size: "1g"
rabbitmq_utility_worker:
build:
context: ../../rabbitmq-util-workers/
dockerfile: docker/development/Dockerfile
depends_on:
rabbitmq:
condition: service_healthy
env_file:
- .rabbitmq_env
- .mailgun_env
environment:
RABBITMQ_LISTEN_TOPIC: email
volumes:
- ../../rabbitmq-util-workers/rabbitmqUtilWorkers:/srv/rabbitmqUtilWorkers/rabbitmqUtilWorkers
logging:
options:
max-size: "1g"
rest:
build:
context: ../../phoenixapi-v1/
dockerfile: docker/development/Dockerfile
ports:
- 8080:8080
depends_on:
- db
db:
condition: service_healthy
rabbitmq:
condition: service_healthy
env_file:
- .env
- .db_env
- .rabbitmq_env
- .mailgun_env
environment:
DEBUG: "yes"
Expand Down Expand Up @@ -94,9 +116,25 @@ services:
db:
image: postgres:alpine
env_file: .db_env
healthcheck:
test: ["CMD-SHELL", "pg_isready --username=phoenix"]
interval: 10s
timeout: 5s
retries: 5
logging:
options:
max-size: "1g"
rabbitmq:
image: rabbitmq:alpine
env_file: .rabbitmq_env
healthcheck:
test: rabbitmq-diagnostics -q ping
interval: 5s
timeout: 30s
retries: 3
logging:
options:
max-size: "1g"
adminer:
depends_on:
- db
Expand Down

0 comments on commit 90440fc

Please sign in to comment.