update version

.github/workflows/buildx.yaml

@@ -4,7 +4,7 @@ name: Docker
 on: [push]
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - name: Prepare
       id: prepare
@@ -19,7 +19,7 @@ jobs:
           echo ::set-output name=version::snapshot
         fi
 
-        echo ::set-output name=docker_platforms::linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386
+        echo ::set-output name=docker_platforms::linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/s390x
         echo ::set-output name=docker_image::${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }}
 
       # https://github.com/crazy-max/ghaction-docker-buildx

.gitignore

@@ -30,5 +30,6 @@ _testmain.go
 
 *.bak
 
+.vscode/
 cmd/gost/gost
 snap

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.18-alpine as builder
 
 # Convert TARGETPLATFORM to GOARCH format
 # https://github.com/tonistiigi/xx

Makefile

@@ -19,6 +19,7 @@ PLATFORM_LIST = \
 	linux-mipsle-hardfloat \
 	linux-mips64 \
 	linux-mips64le \
+	linux-s390x \
 	freebsd-386 \
 	freebsd-amd64
 
@@ -70,6 +71,9 @@ linux-mips64:
 linux-mips64le:
 	GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ $(GOFILES)
 
+linux-s390x:
+	GOARCH=s390x GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ $(GOFILES)
+
 freebsd-386:
 	GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ $(GOFILES)
 

README.md

@@ -1,4 +1,4 @@
-gost - GO Simple Tunnel
+GO Simple Tunnel
 ======
 
 ### GO语言实现的安全隧道
@@ -13,27 +13,29 @@ gost - GO Simple Tunnel
  
 [English README](README_en.md)
 
+### ！！！[V3版本已经可用，欢迎抢先体验](https://latest.gost.run)！！！
+
 特性
 ------
 
 * 多端口监听
 * 可设置转发代理，支持多级转发(代理链)
 * 支持标准HTTP/HTTPS/HTTP2/SOCKS4(A)/SOCKS5代理协议
-* Web代理支持[探测防御](https://docs.ginuerzh.xyz/gost/probe_resist/)
-* [支持多种隧道类型](https://docs.ginuerzh.xyz/gost/configuration/)
-* [SOCKS5代理支持TLS协商加密](https://docs.ginuerzh.xyz/gost/socks/)
-* [Tunnel UDP over TCP](https://docs.ginuerzh.xyz/gost/socks/)
-* [TCP/UDP透明代理](https://docs.ginuerzh.xyz/gost/redirect/)
-* [本地/远程TCP/UDP端口转发](https://docs.ginuerzh.xyz/gost/port-forwarding/)
-* [支持Shadowsocks(TCP/UDP)协议](https://docs.ginuerzh.xyz/gost/ss/)
-* [支持SNI代理](https://docs.ginuerzh.xyz/gost/sni/)
-* [权限控制](https://docs.ginuerzh.xyz/gost/permission/)
-* [负载均衡](https://docs.ginuerzh.xyz/gost/load-balancing/)
-* [路由控制](https://docs.ginuerzh.xyz/gost/bypass/)
-* DNS[解析](https://docs.ginuerzh.xyz/gost/resolver/)和[代理](https://docs.ginuerzh.xyz/gost/dns/)
-* [TUN/TAP设备](https://docs.ginuerzh.xyz/gost/tuntap/)
-
-Wiki站点: <https://docs.ginuerzh.xyz/gost/>
+* Web代理支持[探测防御](https://v2.gost.run/probe_resist/)
+* [支持多种隧道类型](https://v2.gost.run/configuration/)
+* [SOCKS5代理支持TLS协商加密](https://v2.gost.run/socks/)
+* [Tunnel UDP over TCP](https://v2.gost.run/socks/)
+* [TCP/UDP透明代理](https://v2.gost.run/redirect/)
+* [本地/远程TCP/UDP端口转发](https://v2.gost.run/port-forwarding/)
+* [支持Shadowsocks(TCP/UDP)协议](https://v2.gost.run/ss/)
+* [支持SNI代理](https://v2.gost.run/sni/)
+* [权限控制](https://v2.gost.run/permission/)
+* [负载均衡](https://v2.gost.run/load-balancing/)
+* [路由控制](https://v2.gost.run/bypass/)
+* DNS[解析](https://v2.gost.run/resolver/)和[代理](https://v2.gost.run/dns/)
+* [TUN/TAP设备](https://v2.gost.run/tuntap/)
+
+Wiki站点: [v2.gost.run](https://v2.gost.run)
 
 Telegram讨论群: <https://t.me/gogost>
 

gost.go

@@ -20,7 +20,7 @@ import (
 )
 
 // Version is the gost version.
-const Version = "2.11.1"
+const Version = "2.11.2"
 
 // Debug is a flag that enables the debug log.
 var Debug bool

snapcraft.yaml

@@ -1,6 +1,6 @@
 name: gost
 type: app
-version: '2.11.1'
+version: '2.11.2'
 title: GO Simple Tunnel
 summary: A simple security tunnel written in golang
 description: |
@@ -12,7 +12,7 @@ license: MIT
 parts:
   gost:
     plugin: nil
-    build-snaps: [go/1.13/stable]
+    build-snaps: [go/1.18/stable]
     source: https://github.com/ginuerzh/gost.git
     source-subdir: cmd/gost
     source-type: git