Skip to content

Commit

Permalink
Docker-compose: Add mailhog to dc-debug + remove noise (DefectDojo#5945)
Browse files Browse the repository at this point in the history
* Fix indentation in docker-compose.override.debug.yml

For some reason, the structure in `docker-compose.override.debug.yml` was indented more then in other `docker-compose.override.*.yml` files

* Add mailhog to dc-debug + remove noise

Co-authored-by: valentijnscholten <[email protected]>
  • Loading branch information
kiblik and valentijnscholten authored Feb 20, 2022
1 parent 5cb53f5 commit 595c9ab
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
16 changes: 16 additions & 0 deletions docker-compose.override.debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ services:
DD_DEBUG: 'True'
DD_ADMIN_USER: "${DD_ADMIN_USER:-admin}"
DD_ADMIN_PASSWORD: "${DD_ADMIN_PASSWORD:-admin}"
DD_EMAIL_URL: "smtp://mailhog:1025"
ports:
- target: ${DD_DEBUG_PORT:-3000}
published: ${DD_DEBUG_PORT:-3000}
Expand All @@ -17,6 +18,8 @@ services:
celeryworker:
volumes:
- '.:/app:z'
environment:
DD_EMAIL_URL: "smtp://mailhog:1025"
celerybeat:
volumes:
- '.:/app:z'
Expand All @@ -41,3 +44,16 @@ services:
published: ${DD_DATABASE_PORT}
protocol: tcp
mode: host
mailhog:
image: mailhog/mailhog:v1.0.1@sha256:8d76a3d4ffa32a3661311944007a415332c4bb855657f4f6c57996405c009bea
entrypoint: [ "/bin/sh", "-c", "MailHog &>/dev/null" ]
# inspired by https://github.com/mailhog/MailHog/issues/56#issuecomment-291968642
ports:
- target: 1025
published: 1025
protocol: tcp
mode: host
- target: 8025
published: 8025
protocol: tcp
mode: host
2 changes: 2 additions & 0 deletions docker-compose.override.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ services:
mode: host
mailhog:
image: mailhog/mailhog:v1.0.1@sha256:8d76a3d4ffa32a3661311944007a415332c4bb855657f4f6c57996405c009bea
entrypoint: [ "/bin/sh", "-c", "MailHog &>/dev/null" ]
# inspired by https://github.com/mailhog/MailHog/issues/56#issuecomment-291968642
ports:
- target: 1025
published: 1025
Expand Down

0 comments on commit 595c9ab

Please sign in to comment.