From e862ba79f1d931dd0480f022336980808d90c099 Mon Sep 17 00:00:00 2001
From: nadoo <287492+nadoo@users.noreply.github.com>
Date: Tue, 19 Apr 2022 19:09:20 +0800
Subject: [PATCH] docker: add tzdata to set the timezone when running container
e.g:
-e "TZ=Europe/London"
---
.Dockerfile | 2 +-
Dockerfile | 2 +-
README.md | 7 ++-----
go.mod | 6 +++---
go.sum | 12 ++++++------
proxy/vsock/vsock.go | 2 +-
6 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/.Dockerfile b/.Dockerfile
index 83efae1..fc398b6 100644
--- a/.Dockerfile
+++ b/.Dockerfile
@@ -28,7 +28,7 @@ WORKDIR /app
COPY --from=build-env /app /app
RUN apk -U upgrade --no-cache \
- && apk --no-cache add ca-certificates shadow \
+ && apk --no-cache add ca-certificates shadow tzdata \
&& groupadd -g 1000 glider \
&& useradd -r -u 1000 -g glider glider \
&& apk --no-cache del shadow \
diff --git a/Dockerfile b/Dockerfile
index 5f01fdb..0f2ee9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ FROM alpine
COPY --from=build-env /src/glider /app/
RUN apk -U upgrade --no-cache \
- && apk --no-cache add bind-tools ca-certificates shadow \
+ && apk --no-cache add bind-tools ca-certificates shadow tzdata \
&& groupadd -g 1000 glider \
&& useradd -r -u 1000 -g glider glider \
&& apk --no-cache del shadow \
diff --git a/README.md b/README.md
index d932708..6b815bc 100644
--- a/README.md
+++ b/README.md
@@ -226,8 +226,6 @@ glider 0.16.0, https://github.com/nadoo/glider (glider.proxy@gmail.com)
-#### Schemes
-
glider -scheme all
@@ -351,7 +349,7 @@ TLS and Websocket with a specified proxy protocol:
tls://host:port[?skipVerify=true],ws://[@/path[?host=HOST]],vmess://[security:]uuid@?alterID=num
--
-VM socket scheme:
+VM socket scheme(linux only):
vsock://[CID]:port
if you want to listen on any address, just set CID to 4294967295.
@@ -359,8 +357,6 @@ VM socket scheme:
-#### Examples
-
glider -example
@@ -428,6 +424,7 @@ Examples:
```
docker run -d --name glider --net host --restart=always \
-v /etc/glider:/etc/glider \
+ -e "TZ=Europe/London" \
nadoo/glider -config=/etc/glider/glider.conf
```
- run watchtower (if you need auto update for glider)
diff --git a/go.mod b/go.mod
index 90e0060..fbf32e5 100644
--- a/go.mod
+++ b/go.mod
@@ -11,8 +11,8 @@ require (
github.com/nadoo/conflag v0.3.1
github.com/nadoo/ipset v0.5.0
github.com/xtaci/kcp-go/v5 v5.6.1
- golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29
- golang.org/x/sys v0.0.0-20220405210540-1e041c57c461
+ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
+ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
)
require (
@@ -26,7 +26,7 @@ require (
github.com/templexxx/xorsimd v0.4.1 // indirect
github.com/tjfoc/gmsm v1.4.1 // indirect
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
- golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect
+ golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2 // indirect
)
// Replace dependency modules with local developing copy
diff --git a/go.sum b/go.sum
index 1de4466..0c72f8e 100644
--- a/go.sum
+++ b/go.sum
@@ -111,8 +111,8 @@ golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 h1:tkVvjkPTB7pnW3jnid7kNyAMPVWllTNOf/qKDze4p9o=
-golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -136,8 +136,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20220403103023-749bd193bc2b h1:vI32FkLJNAWtGD4BwkThwEy6XS7ZLLMHkSkYfF8M0W0=
-golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2 h1:6mzvA99KwZxbOrxww4EvWVQUnN1+xEu9tafK5ZxkYeA=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -164,8 +164,8 @@ golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 h1:kHVeDEnfKn3T238CvrUcz6KeEsFHVaKh4kMTt6Wsysg=
-golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff --git a/proxy/vsock/vsock.go b/proxy/vsock/vsock.go
index e4e9b7f..b03b440 100644
--- a/proxy/vsock/vsock.go
+++ b/proxy/vsock/vsock.go
@@ -57,7 +57,7 @@ func (s *vsock) Addr() string {
func init() {
proxy.AddUsage("vsock", `
-VM socket scheme:
+VM socket scheme(linux only):
vsock://[CID]:port
if you want to listen on any address, just set CID to 4294967295.