From 497785553d40bfd6044ff04088c4f0ad83da46cb Mon Sep 17 00:00:00 2001
From: crusader <crusader@loafle.com>
Date: Mon, 26 Mar 2018 23:06:35 +0900
Subject: [PATCH] ing

---
 Dockerfile                                                  | 5 ++---
 build/docker/conf/database.properties                       | 2 +-
 build/docker/conf/velocity.properties                       | 6 ++++++
 .../java/com/loafle/overflow/commons/utils/EmailSender.java | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 build/docker/conf/velocity.properties

diff --git a/Dockerfile b/Dockerfile
index 78519e1..bb75076 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,13 +14,12 @@ ADD target/${APP_FILENAME} ${APP_HOME_PATH}/
 RUN apk add --no-cache curl \
     && chmod +x /opt/bin/*.sh
 
-ENV TINI_VERSION='0.15.0' \
+ENV TINI_VERSION='0.17.0' \
     TINI_SHA='4007655082f573603c02bc1d2137443c8e153af047ffd088d02ccc01e6f06170'
 
 # Use tini as subreaper in Docker container to adopt zombie processes
 RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini \
-    && chmod +x /bin/tini \
-    && echo "$TINI_SHA  /bin/tini" | sha256sum -c -
+    && chmod +x /bin/tini
 
 VOLUME ${APP_CONF_PATH}
 EXPOSE 50006
diff --git a/build/docker/conf/database.properties b/build/docker/conf/database.properties
index 0bc0a7d..e8c1188 100644
--- a/build/docker/conf/database.properties
+++ b/build/docker/conf/database.properties
@@ -5,7 +5,7 @@ datasource.driver-class-name=org.postgresql.Driver
 
 jpa.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 jpa.database=postgresql
-jpa.hibernate.ddl-auto=none
+jpa.hibernate.ddl-auto=create
 #jpa.hibernate.ddl-auto=update
 jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
 jpa.show-sql=true
diff --git a/build/docker/conf/velocity.properties b/build/docker/conf/velocity.properties
new file mode 100644
index 0000000..c298824
--- /dev/null
+++ b/build/docker/conf/velocity.properties
@@ -0,0 +1,6 @@
+resource.loader=jar
+jar.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+jar.runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
+jar.runtime.log.logsystem.log4j.category=velocity
+jar.resource.loader.cache=true
+input.encoding=UTF-8
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/commons/utils/EmailSender.java b/src/main/java/com/loafle/overflow/commons/utils/EmailSender.java
index 80feab1..97f9b9f 100644
--- a/src/main/java/com/loafle/overflow/commons/utils/EmailSender.java
+++ b/src/main/java/com/loafle/overflow/commons/utils/EmailSender.java
@@ -9,6 +9,7 @@ import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.velocity.VelocityEngineUtils;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;