From 8783587e6732e06204445882c1c5045b49a82b22 Mon Sep 17 00:00:00 2001
From: mlm483 <128052931+mlm483@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:11:23 -0400
Subject: [PATCH 1/2] [BI-2101] - updated .env.template

---
 .env.template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.template b/.env.template
index da7121c..0ea18cf 100644
--- a/.env.template
+++ b/.env.template
@@ -46,9 +46,11 @@ ANALYTICS_GTAG_ID=<Google analytics gtag id>
 REGISTERED_DOMAIN=localhost
 
 # Email relay information
-EMAIL_RELAY_HOST=mailhog
-EMAIL_RELAY_PORT=1025
+EMAIL_RELAY_HOST=<mailhog for development, email-smtp.us-east-1.amazonaws.com for production>
+EMAIL_RELAY_PORT=<1025 for development, 25 for production>
 EMAIL_FROM=noreply@breedinginsight.org
+#EMAIL_RELAY_LOGIN=<blank for development>
+#EMAIL_RELAY_PASSWORD=<blank for development>
 
 REDIS_URL=<redis url, ex redis://localhost:6379>
 REDIS_TIMEOUT=<timeout, default 30s>

From 623eac216feff4a3115063266bbb31f02aeb692b Mon Sep 17 00:00:00 2001
From: mlm483 <128052931+mlm483@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:18:51 -0400
Subject: [PATCH 2/2] [BI-2101] - moved mailhog from the base
 docker-compose.yml

---
 docker-compose-ci.yml  | 9 +++++++++
 docker-compose-dev.yml | 8 +++++++-
 docker-compose-qa.yml  | 9 +++++++++
 docker-compose-rc.yml  | 9 +++++++++
 docker-compose.yml     | 9 ---------
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index aa1b086..438333e 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -30,6 +30,15 @@ services:
       - REDIS_TIMEOUT=${REDIS_TIMEOUT:-30s}
       - REDIS_SSL=${REDIS_SSL:-false}
       - GIGWA_HOST=${GIGWA_HOST:-http://gigwa:8080}
+  mailhog:
+    image: mailhog/mailhog:latest
+    container_name: mailhog
+    restart: always
+    ports:
+      - ${MAILHOG_WEB_PORT:-8025}:8025
+      - ${MAILHOG_PORT:-1025}:1025
+    networks:
+      backend:
   brapi-server:
     image: breedinginsight/brapi-java-server:develop
     ports:
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index ddb81bb..063f633 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -58,8 +58,14 @@ services:
     ports:
       - ${BRAPI_SERVER_PORT:-8080}:8080    
   mailhog:
+    image: mailhog/mailhog:latest
+    container_name: mailhog
+    restart: always
     ports:
-      - 1025:1025
+      - ${MAILHOG_WEB_PORT:-8025}:8025
+      - ${MAILHOG_PORT:-1025}:1025
+    networks:
+      backend:
   bidb:
     ports:
       - 5432:5432
diff --git a/docker-compose-qa.yml b/docker-compose-qa.yml
index 3771d78..515f5f3 100644
--- a/docker-compose-qa.yml
+++ b/docker-compose-qa.yml
@@ -22,3 +22,12 @@ services:
   bidb:
     ports:
       - ${DB_PORT:-5432}:5432
+  mailhog:
+    image: mailhog/mailhog:latest
+    container_name: mailhog
+    restart: always
+    ports:
+      - ${MAILHOG_WEB_PORT:-8025}:8025
+      - ${MAILHOG_PORT:-1025}:1025
+    networks:
+      backend:
diff --git a/docker-compose-rc.yml b/docker-compose-rc.yml
index 2bf572f..c535b92 100644
--- a/docker-compose-rc.yml
+++ b/docker-compose-rc.yml
@@ -9,3 +9,12 @@ services:
     image: breedinginsight/biapi:rc
   brapi-server:
     image: breedinginsight/brapi-java-server:rc
+  mailhog:
+    image: mailhog/mailhog:latest
+    container_name: mailhog
+    restart: always
+    ports:
+      - ${MAILHOG_WEB_PORT:-8025}:8025
+      - ${MAILHOG_PORT:-1025}:1025
+    networks:
+      backend:
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ce491f..6fa626d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -82,15 +82,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-  mailhog:
-    image: mailhog/mailhog:latest
-    container_name: mailhog
-    restart: always
-    ports:
-      - ${MAILHOG_WEB_PORT:-8025}:8025
-      - ${MAILHOG_PORT:-1025}:1025
-    networks:
-      backend:
   bidb: 
     image: postgres:11.4
     environment: