chore: bump x to v0.11.0

fix(e2e): use host network for Docker image builds in DinD environments
Docker-in-Docker containers cannot reach the internet via the default bridge network, causing 'apk add' in the Dockerfile to hang indefinitely and e2e tests to timeout after 10 minutes. Add BuildOptionsModifier with NetworkMode=host to all FromDockerfile definitions so the build step uses the host's network stack. This has no negative impact on non-DinD environments where bridge networking already works. Also move GostBinPath flag and init() from main_test.go to utils.go (non-test file) so the symbol is accessible across the package.
2026-10-08 12:05:46 +00:00 · 2026-06-17 22:32:51 +08:00 · 2026-06-06 20:34:24 +08:00 · 2026-06-05 23:27:22 +08:00 · 2026-06-03 23:30:01 +08:00 · 2026-06-03 23:25:54 +08:00
6 changed files with 38 additions and 81 deletions
@@ -40,65 +40,10 @@ builds:
      - "-s -w -X 'main.version={{ .Tag }}'"

 upx:
-  - # Whether to enable it or not.
-    #
-    # Templates: allowed.
-    enabled: true
-
-    # Filter by build ID.
-    # ids: [build1, build2]
-
-    # Filter by GOOS.
-    goos: [linux]
-
-    # Filter by GOARCH.
-    goarch: [arm, arm64, amd64]
-
-    # Filter by GOARM.
-    # goarm: [8]
-
-    # Filter by GOAMD64.
-    # goamd64: [v1]
-
-    # Compress argument.
-    # Valid options are from '1' (faster) to '9' (better), and 'best'.
-    compress: best
-
-    # Whether to try LZMA (slower).
-    lzma: true
-
-    # Whether to try all methods and filters (slow).
-    brute: true
-
-  - # Whether to enable it or not.
-    #
-    # Templates: allowed.
-    enabled: true
-
-    # Filter by build ID.
-    # ids: [build1, build2]
-
-    # Filter by GOOS.
-    goos: [windows]
-
-    # Filter by GOARCH.
-    goarch: [amd64]
-
-    # Filter by GOARM.
-    # goarm: [8]
-
-    # Filter by GOAMD64.
-    # goamd64: [v1]
-
-    # Compress argument.
-    # Valid options are from '1' (faster) to '9' (better), and 'best'.
-    compress: best
-
-    # Whether to try LZMA (slower).
-    lzma: true
-
-    # Whether to try all methods and filters (slow).
-    brute: true
+  - # UPX compression. Disabled by default (see #863): upx --best/--lzma/--brute
+    # adds ~3s startup time on low-spec systems (linux/arm). Release builds can
+    # opt in via GORELEASER_UPX=true environment variable.
+    enabled: false

 archives:
  - format: tar.gz
@@ -2,8 +2,10 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1 AS xx

 FROM --platform=$BUILDPLATFORM golang:1.26-alpine3.23 AS builder

-# add upx for binary compression
-RUN apk add --no-cache upx || echo "upx not found"
+# UPX compression disabled by default (see #863): upx --best adds ~3s startup
+# time on low-spec systems (linux/arm). Builds can opt in by uncommenting the
+# upx install line and adding upx --best to the build command below.
+# RUN apk add --no-cache upx || echo "upx not found"

 COPY --from=xx / /

@@ -21,13 +23,12 @@ COPY . .

 RUN cd cmd/gost && \
    xx-go build -ldflags "-s -w" && \
-    xx-verify gost && \
-    { upx --best gost || true; }
+    xx-verify gost

 FROM alpine:3.23

-# add iptables for tun/tap
-RUN apk add --no-cache iptables
+# add iptables/nftables for tun/tap
+RUN apk add --no-cache iptables nftables

 WORKDIR /bin/

@@ -3,9 +3,10 @@ module github.com/go-gost/gost
 go 1.26.3

 require (
-	github.com/go-gost/core v0.4.0
-	github.com/go-gost/x v0.10.3
+	github.com/go-gost/core v0.4.1
+	github.com/go-gost/x v0.11.0
 	github.com/judwhite/go-svc v1.2.1
+	github.com/moby/moby/client v0.4.0
 	github.com/stretchr/testify v1.11.1
 	github.com/testcontainers/testcontainers-go v0.42.0
 )
@@ -83,7 +84,6 @@ require (
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/go-archive v0.2.0 // indirect
 	github.com/moby/moby/api v1.54.1 // indirect
-	github.com/moby/moby/client v0.4.0 // indirect
 	github.com/moby/patternmatcher v0.6.1 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/moby/sys/user v0.4.0 // indirect
@@ -107,7 +107,7 @@ require (
 	github.com/prometheus/common v0.48.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/quic-go/qpack v0.6.0 // indirect
-	github.com/quic-go/quic-go v0.59.0 // indirect
+	github.com/quic-go/quic-go v0.59.1 // indirect
 	github.com/quic-go/webtransport-go v0.10.0 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/rs/xid v1.3.0 // indirect
@@ -81,8 +81,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
 github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/go-gost/core v0.4.0 h1:jLuIMO7ZMJX/BDCYLrYXAmIykT+HkqEuzaTeLMdrY1c=
-github.com/go-gost/core v0.4.0/go.mod h1:WGI43jOka7FAsSAwi/fSMaqxdR+E339ycb4NBGlFr6A=
+github.com/go-gost/core v0.4.1 h1:/MZYv0tSkw9yoK2nl0GLl3GjT1/3qKl5u3E/DADyeZE=
+github.com/go-gost/core v0.4.1/go.mod h1:WGI43jOka7FAsSAwi/fSMaqxdR+E339ycb4NBGlFr6A=
 github.com/go-gost/go-shadowsocks2 v0.1.3 h1:6CUZLp+mTWXnKP2aK8/Z9ZP+ERMX9gSbywmPu4kGX/A=
 github.com/go-gost/go-shadowsocks2 v0.1.3/go.mod h1:866zFNNI3He6Wef1M/IvAjTal74WhcfKfBgRpTlkKys=
 github.com/go-gost/gosocks4 v0.1.0 h1:eAzev6qw4fzkFQKC9uCHLVNnnPdHyqCggbnfNN80Pmk=
@@ -95,8 +95,8 @@ github.com/go-gost/relay v0.6.0 h1:o8r0B3eTw8Rwwent+5x5Cw1g4AyNUl4hNqiyDJXkFvA=
 github.com/go-gost/relay v0.6.0/go.mod h1:Dku0f5sfjOClrZFiDmQUrYYJ4uof7rnkCUBfsl0PSAI=
 github.com/go-gost/tls-dissector v0.2.0 h1:9tE6WOzzpurATTBWn60DU4R8gibpGNY8/qVcc1SicVg=
 github.com/go-gost/tls-dissector v0.2.0/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs=
-github.com/go-gost/x v0.10.3 h1:GDLBxe5lJ8l2NIXN4Qe2Xu6BoQVOMggL2XeFtkcSE2M=
-github.com/go-gost/x v0.10.3/go.mod h1:TKBCBXi1Is+X/6KP0ek5nLkWW5ruQwjc6I069Lo19D0=
+github.com/go-gost/x v0.11.0 h1:fTkdKSwIfTwGtBmYA4sguWJUv4KnvqWyUNv4mr0lAlE=
+github.com/go-gost/x v0.11.0/go.mod h1:gKZwVEQh4ebC9eLP8zv9z3TwfOuKEl1Kk0vC/BfQaUQ=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -252,8 +252,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
 github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
-github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
-github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
+github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic=
+github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
 github.com/quic-go/webtransport-go v0.10.0 h1:LqXXPOXuETY5Xe8ITdGisBzTYmUOy5eSj+9n4hLTjHI=
 github.com/quic-go/webtransport-go v0.10.0/go.mod h1:LeGIXr5BQKE3UsynwVBeQrU1TPrbh73MGoC6jd+V7ow=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
@@ -13,12 +13,6 @@ import (

 var SharedNetworkName string

-var GostBinPath string
-
-func init() {
-	flag.StringVar(&GostBinPath, "gost-bin", "", "Path to a pre-built gost binary (skips compilation)")
-}
-
 func TestMain(m *testing.M) {
 	flag.Parse()
 	ctx := context.Background()
@@ -2,15 +2,23 @@ package e2e

 import (
 	"context"
+	"flag"
 	"io"
 	"os"
 	"testing"
 	"text/template"

+	"github.com/moby/moby/client"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 )

+var GostBinPath string
+
+func init() {
+	flag.StringVar(&GostBinPath, "gost-bin", "", "Path to a pre-built gost binary (skips compilation)")
+}
+
 type ConfigData struct {
 	ServerAddr string
 }
@@ -70,6 +78,9 @@ func echoContainerRequest(_ context.Context, networkName string) testcontainers.
 			Repo:       "gost-e2e",
 			Tag:        "latest",
 			KeepImage:  true,
+			BuildOptionsModifier: func(opts *client.ImageBuildOptions) {
+				opts.NetworkMode = "host"
+			},
 		},
 		Networks: []string{networkName},
 		NetworkAliases: map[string][]string{
@@ -100,6 +111,9 @@ func udpEchoContainerRequest(_ context.Context, networkName string) testcontaine
 			Repo:       "gost-e2e",
 			Tag:        "latest",
 			KeepImage:  true,
+			BuildOptionsModifier: func(opts *client.ImageBuildOptions) {
+				opts.NetworkMode = "host"
+			},
 		},
 		Networks: []string{networkName},
 		NetworkAliases: map[string][]string{
@@ -134,6 +148,9 @@ func runGostContainer(ctx context.Context, networkName, yamlPath string, aliases
 			Repo:       "gost-e2e",
 			Tag:        "latest",
 			KeepImage:  true,
+			BuildOptionsModifier: func(opts *client.ImageBuildOptions) {
+				opts.NetworkMode = "host"
+			},
 		},
 		ExposedPorts: exposedPorts,
 		// interal check for udp ports will be failed
Author	SHA1	Message	Date
ginuerzh	6d80e06ab3	chore: bump x to v0.11.0	2026-06-17 22:32:51 +08:00
ginuerzh	e2447ce578	fix(e2e): use host network for Docker image builds in DinD environments Docker-in-Docker containers cannot reach the internet via the default bridge network, causing 'apk add' in the Dockerfile to hang indefinitely and e2e tests to timeout after 10 minutes. Add BuildOptionsModifier with NetworkMode=host to all FromDockerfile definitions so the build step uses the host's network stack. This has no negative impact on non-DinD environments where bridge networking already works. Also move GostBinPath flag and init() from main_test.go to utils.go (non-test file) so the symbol is accessible across the package.	2026-06-06 20:34:24 +08:00
ginuerzh	811420e923	chore: bump x to include stateless UDP forwarding (#853 )	2026-06-05 23:27:22 +08:00
ginuerzh	374b46dfe1	bump x to v0.10.10	2026-06-03 23:30:01 +08:00
ginuerzh	22edb92084	bump x to v0.10.10	2026-06-03 23:25:54 +08:00
ginuerzh	78a0a8c734	fix: disable UPX compression in Dockerfile to resolve #863 startup regression	2026-06-03 00:13:58 +08:00
ZHAO Jin-Xiang	41e1878ebc	feat: add nftables package to Dockerfile (#865 ) nftables is a more modern iptables which supports both ipv4 and ipv6.	2026-06-02 23:56:53 +08:00
ginuerzh	5639c90e98	bump x to v0.10.9	2026-06-02 23:54:13 +08:00
ginuerzh	36abf9bcd9	bump x to v0.10.8	2026-06-02 20:07:48 +08:00
ginuerzh	d584b7ac61	bump x to v0.10.7	2026-05-31 22:49:10 +08:00
ginuerzh	56e2a1c496	fix: disable UPX compression to resolve #863 startup regression UPX --best/--lzma/--brute adds ~3s startup time on low-spec systems (linux/arm) due to in-memory decompression on every invocation of gost -V. Disabled by default; opt in via GORELEASER_UPX=true for release builds that need it.	2026-05-31 22:25:57 +08:00
ginuerzh	b0bea19275	bump x to v0.10.6	2026-05-31 22:13:42 +08:00
ginuerzh	cd64f2edd3	bump x to v0.10.5	2026-05-31 19:50:49 +08:00
ginuerzh	5f04c84e32	bump core to v0.4.1	2026-05-31 19:40:28 +08:00
ginuerzh	600a64e611	bump x to v0.10.4	2026-05-31 17:47:52 +08:00