From a09797101f1ac46e3ad7487fa3911e896c890d55 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 12 Jul 2022 11:28:05 -0700
Subject: [PATCH] SHIBUI-2273

fixes for sqlserver docker
---
 testbed/sqlServer/conf/application.yml | 16 ++++++++--------
 testbed/sqlServer/docker-compose.yml   |  9 ++++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/testbed/sqlServer/conf/application.yml b/testbed/sqlServer/conf/application.yml
index 1e48abf4d..f69ccb318 100644
--- a/testbed/sqlServer/conf/application.yml
+++ b/testbed/sqlServer/conf/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    include:
+    include: dev
   datasource:
     platform: sqlserver
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -11,13 +11,13 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.SQLServerDialect
-#server:
-#  port: 8443
-#  ssl:
-#    key-store: "/conf/keystore.p12"
-#    key-store-password: "changeit"
-#    keyStoreType: "PKCS12"
-#    keyAlias: "tomcat"
+server:
+  port: 8443
+  ssl:
+    key-store: "/conf/keystore.p12"
+    key-store-password: "changeit"
+    keyStoreType: "PKCS12"
+    keyAlias: "tomcat"
 shibui:
   user-bootstrap-resource: file:/conf/users.csv
   roles: ROLE_ADMIN,ROLE_NONE,ROLE_USER,ROLE_PONY
diff --git a/testbed/sqlServer/docker-compose.yml b/testbed/sqlServer/docker-compose.yml
index a7509fe37..68276f256 100644
--- a/testbed/sqlServer/docker-compose.yml
+++ b/testbed/sqlServer/docker-compose.yml
@@ -23,7 +23,14 @@ services:
       - db
     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