From b3eed9c9018ed5e852788242c504bb8f3dd0060d Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 22 Jan 2019 10:00:36 -0700
Subject: [PATCH] [SHIBUI-1029]

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.
---
 backend/src/main/resources/application.properties |  2 +-
 pac4j-module/src/test/docker/docker-compose.yml   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 6e999d002..ab466cce6 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -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
diff --git a/pac4j-module/src/test/docker/docker-compose.yml b/pac4j-module/src/test/docker/docker-compose.yml
index e6b2f6e70..ac3a781c2 100644
--- a/pac4j-module/src/test/docker/docker-compose.yml
+++ b/pac4j-module/src/test/docker/docker-compose.yml
@@ -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
@@ -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
\ No newline at end of file
+    driver: bridge