Skip to content

Commit

Permalink
[SHIBUI-1029]
Browse files Browse the repository at this point in the history
Updated backend app props to point spring mail at "mailhog" for use in
the pac4j docker build. Added dev config to pac4j docker-compose so
there will be admins to send email to. Added mailhog to the pac4j
docker-compose so that there is a place for the app to send new user
emails to.
  • Loading branch information
Bill Smith committed Jan 22, 2019
1 parent 1030510 commit b3eed9c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ shibui.nameid-filter-ui-schema-location=classpath:nameid-filter.schema.json
# shibui.metadataProviders.taskRunRate=30000

# Email configuration (local mailhog)
spring.mail.host=localhost
spring.mail.host=mailhog
spring.mail.port=1025
spring.mail.username=username
spring.mail.password=password
Expand Down
14 changes: 12 additions & 2 deletions pac4j-module/src/test/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.7"
services:
shibui:
image: unicon/shibui-pac4j
entrypoint: ["/usr/bin/java", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-jar", "app.jar"]
entrypoint: ["/usr/bin/java", "-Dspring.profiles.active=dev", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-jar", "app.jar"]
ports:
- 8080:8080
- 5005:5005
Expand All @@ -13,6 +13,16 @@ services:
- ./conf/application.yml:/application.yml
networks:
- front

mailhog:
image: mailhog/mailhog:latest
ports:
- 1025:1025
- 8025:8025
container_name: mailhog
networks:
- front

networks:
front:
driver: bridge
driver: bridge

0 comments on commit b3eed9c

Please sign in to comment.