From 8f2472758f755d14b0b71d10d041a062ae8cf1a4 Mon Sep 17 00:00:00 2001
From: gVisor bot <gvisor-bot@google.com>
Date: Mon, 18 Jun 2018 18:24:11 +0800
Subject: [PATCH] Improve: ci config and Dockerfile & update dependencies

---
 .travis.yml |  2 +-
 Dockerfile  |  2 +-
 Gopkg.lock  | 16 ++++++++++++++--
 Gopkg.toml  |  8 ++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23461177..4714980b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
     - NAME=clash
     - BINDIR=bin
 script:
-  - go test
+  - go test ./...
 before_deploy: make -j releases
 deploy:
   provider: releases
diff --git a/Dockerfile b/Dockerfile
index ec3b6e43..3cada3f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN dep ensure && \
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates && \
     mkdir -p /root/.config/clash
-COPY --from=builder /clash .
 COPY --from=builder /Country.mmdb /root/.config/clash/
+COPY --from=builder /clash .
 EXPOSE 7890 7891
 ENTRYPOINT ["/clash"]
diff --git a/Gopkg.lock b/Gopkg.lock
index 947f49bd..a879f708 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -13,6 +13,18 @@
   revision = "44cc805cf13205b55f69e14bcb69867d1ae92f98"
   version = "v1.1.0"
 
+[[projects]]
+  name = "github.com/go-chi/chi"
+  packages = ["."]
+  revision = "e83ac2304db3c50cf03d96a2fcd39009d458bc35"
+  version = "v3.3.2"
+
+[[projects]]
+  name = "github.com/go-chi/render"
+  packages = ["."]
+  revision = "3215478343fbc559bd3fc08f7031bb134d6bdad5"
+  version = "v1.0.1"
+
 [[projects]]
   name = "github.com/oschwald/geoip2-golang"
   packages = ["."]
@@ -53,7 +65,7 @@
     "poly1305",
     "ssh/terminal"
   ]
-  revision = "a8fb68e7206f8c78be19b432c58eb52a6aa34462"
+  revision = "027cca12c2d63e3d62b670d901e8a2c95854feec"
 
 [[projects]]
   branch = "master"
@@ -80,6 +92,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "4297c505508c6cdd8c94fd4ef29bc6940c65fea81e125fcf871a316b6e671a71"
+  inputs-digest = "c3c901e4e393a2df9e421924d3a4d85ec73642e36dcbc1ddca5fc13159220e86"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 7ce64755..ffa7005a 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -25,6 +25,14 @@
 #   unused-packages = true
 
 
+[[constraint]]
+  name = "github.com/go-chi/chi"
+  version = "3.3.2"
+
+[[constraint]]
+  name = "github.com/go-chi/render"
+  version = "1.0.1"
+
 [[constraint]]
   name = "github.com/oschwald/geoip2-golang"
   version = "1.2.1"