Improve: ci config and Dockerfile & update dependencies

This commit is contained in:
Dreamacro 2018-06-18 18:24:11 +08:00
parent 79e5338113
commit 330a3391e3
4 changed files with 24 additions and 4 deletions

View File

@ -11,7 +11,7 @@ env:
- NAME=clash - NAME=clash
- BINDIR=bin - BINDIR=bin
script: script:
- go test - go test ./...
before_deploy: make -j releases before_deploy: make -j releases
deploy: deploy:
provider: releases provider: releases

View File

@ -13,7 +13,7 @@ RUN dep ensure && \
FROM alpine:latest FROM alpine:latest
RUN apk --no-cache add ca-certificates && \ RUN apk --no-cache add ca-certificates && \
mkdir -p /root/.config/clash mkdir -p /root/.config/clash
COPY --from=builder /clash .
COPY --from=builder /Country.mmdb /root/.config/clash/ COPY --from=builder /Country.mmdb /root/.config/clash/
COPY --from=builder /clash .
EXPOSE 7890 7891 EXPOSE 7890 7891
ENTRYPOINT ["/clash"] ENTRYPOINT ["/clash"]

16
Gopkg.lock generated
View File

@ -13,6 +13,18 @@
revision = "44cc805cf13205b55f69e14bcb69867d1ae92f98" revision = "44cc805cf13205b55f69e14bcb69867d1ae92f98"
version = "v1.1.0" 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]] [[projects]]
name = "github.com/oschwald/geoip2-golang" name = "github.com/oschwald/geoip2-golang"
packages = ["."] packages = ["."]
@ -53,7 +65,7 @@
"poly1305", "poly1305",
"ssh/terminal" "ssh/terminal"
] ]
revision = "a8fb68e7206f8c78be19b432c58eb52a6aa34462" revision = "027cca12c2d63e3d62b670d901e8a2c95854feec"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -80,6 +92,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "4297c505508c6cdd8c94fd4ef29bc6940c65fea81e125fcf871a316b6e671a71" inputs-digest = "c3c901e4e393a2df9e421924d3a4d85ec73642e36dcbc1ddca5fc13159220e86"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

View File

@ -25,6 +25,14 @@
# unused-packages = true # 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]] [[constraint]]
name = "github.com/oschwald/geoip2-golang" name = "github.com/oschwald/geoip2-golang"
version = "1.2.1" version = "1.2.1"