ci: change to Go1.18

nadoo · Mar 16, 2022 · 7c18fd7 · 7c18fd7
1 parent 3740375
commit 7c18fd7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,8 +32,7 @@ jobs:
         uses: actions/setup-go@v3
         with:
           check-latest: true
-          go-version: '1.18.0-rc.1' 
-          # go-version: ${{ env.GO_MOD_VERSION}}
+          go-version: ${{ env.GO_MOD_VERSION}}
 
       - name: Set up Cache
         uses: actions/cache@v2

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build Stage
-FROM golang:1.18 AS build-env
+FROM golang:1.18-alpine AS build-env
 
 ADD . /src
 

diff --git a/README.md b/README.md
@@ -417,20 +417,22 @@ Examples:
 
 - <details> <summary>docker: click to see details</summary>
 
-  - run glider
+  - run glider (config file path: /etc/glider/glider.conf)
     ```
-    docker run -d --name glider --net host --restart=always -v /etc/glider:/etc/glider nadoo/glider:latest -config=/etc/glider/glider.conf
+    docker run -d --name glider --net host --restart=always \
+      -v /etc/glider:/etc/glider \
+      nadoo/glider -config=/etc/glider/glider.conf
     ```
-  - run watchtower(if you need auto update for glider)
+  - run watchtower (if you need auto update for glider)
     ```
     docker run -d --name watchtower --restart=always \
       -v /var/run/docker.sock:/var/run/docker.sock \
-      containrrr/watchtower \
-      --interval 21600 --cleanup true glider
+      containrrr/watchtower --interval 21600 --cleanup \
+      glider
     ```
-  - open udp ports(if you need nat fullcone)
+  - open udp ports (if you need udp nat fullcone)
     ```
-    iptables -A INPUT -p udp -m udp --dport 1024:65535 -j ACCEPT
+    iptables -I INPUT -p udp -m udp --dport 1024:65535 -j ACCEPT
     ```
   
   </details>

diff --git 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-20220313003712-b769efc7c000
-	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
+	golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86
 )
 
 require (

diff --git 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-20220313003712-b769efc7c000 h1:SL+8VVnkqyshUSz5iNnXtrBQzvFF2SkROm6t5RczFAE=
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
+golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/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=
@@ -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-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 h1:A9i04dxx7Cribqbs8jf3FQLogkL/CV2YN7hj9KWJCkc=
+golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/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=