Skip to content

Commit

Permalink
Merge pull request #50 from bigbighill/dev
Browse files Browse the repository at this point in the history
增加时区,方便查看日志
  • Loading branch information
p4gefau1t authored May 8, 2020
2 parents 3005f4c + 076ed78 commit 98cf6a4
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +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"]
CMD ["/etc/trojan-go/config.json"]
CMD ["/etc/trojan-go/server.json"]

0 comments on commit 98cf6a4

Please sign in to comment.