From df89b6a5b707f339c620625d34089f1895afe33d Mon Sep 17 00:00:00 2001
From: bigbighill <bigbighill@gmail.com>
Date: Fri, 8 May 2020 18:28:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=9F=A5=E7=9C=8B=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e23e8a7f8..150e0c1bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,5 +11,11 @@ WORKDIR /
 COPY --from=builder /trojan-go/release /usr/local/bin/
 COPY example/server.json /etc/trojan-go/
 
+RUN set -ex \
+	&& apk add --no-cache \
+			tzdata
+ENV TZ=Asia/Shanghai
+
+
 ENTRYPOINT ["/usr/local/bin/trojan-go", "-config"]
-CMD ["/etc/trojan-go/server.json"]
\ No newline at end of file
+CMD ["/etc/trojan-go/server.json"]

From 076ed787429c5db97e69d4a065cf083f64e55511 Mon Sep 17 00:00:00 2001
From: bigbighill <bigbighill@gmail.com>
Date: Fri, 8 May 2020 18:38:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=9F=A5=E7=9C=8B=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0404afe2e..5e50ccd25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,12 @@ WORKDIR /
 COPY --from=builder /trojan-go/release /usr/local/bin/
 COPY example/server.json /etc/trojan-go/config.json
 
+RUN set -ex \
+	&& apk add --no-cache \
+			tzdata
+ENV TZ=Asia/Shanghai
+
 
 ENTRYPOINT ["/usr/local/bin/trojan-go", "-config"]
-<<<<<<< HEAD
 CMD ["/etc/trojan-go/server.json"]
-=======
-CMD ["/etc/trojan-go/config.json"]
->>>>>>> 3005f4c60a79faf2f7024a1d67fc75328cbdf433
+