From 367ec291837859428b7584e7097ae9c887275a4d Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Fri, 28 Dec 2018 22:50:31 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile          | 6 ++++--
 docker-compose.yaml | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c24999913..1630a0e6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Ryan Wang<i@ryanc.cc>"
 
 WORKDIR /opt/halo
 ADD . /tmp
-ENV TZ=Asia/Shanghai
+ENV TZ=Asia/Shanghai \
+DB_USER="admin" \
+DB_PASSWORD="123456"
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
@@ -12,4 +14,4 @@ RUN cd /tmp && mvn package -Pci && mv target/dist/halo/* /opt/halo/ \
 
 EXPOSE 8090
 
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/opt/halo/halo-latest.jar","--spring.profiles.active=docker"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/opt/halo/halo-latest.jar","--spring.datasource.username=$DB_USER","--spring.datasource.password=$DB_PASSWORD"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 924d8d2c6..031c1cc7c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -25,6 +25,8 @@ services:
       - VIRTUAL_HOST=localhost  #监听的地址
       - LETSENCRYPT_HOST=localhost #证书的域名
       - LETSENCRYPT_EMAIL=i@example.com #证书所有者的邮箱，快过期时会提醒
+      - DB_USER=admin
+      - DB_PASSWORD=123456
     volumes:
       - ~/halo:/root/halo