From 07b69aa1b9db1f4ca544d3c830feba0358d4994e Mon Sep 17 00:00:00 2001
From: Meow <197331664+Meo597@users.noreply.github.com>
Date: Mon, 18 Aug 2025 01:19:05 +0800
Subject: [PATCH 1/4] Update Dockerfile

---
 .github/docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
index 0b6f29325640..a8a83619b146 100644
--- a/.github/docker/Dockerfile
+++ b/.github/docker/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:latest
-FROM --platform=$BUILDPLATFORM golang:latest AS build
+FROM --platform=$BUILDPLATFORM golang:1.25 AS build
 
 # Build xray-core
 WORKDIR /src
 COPY . .
 ARG TARGETOS
 ARG TARGETARCH
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -o xray -trimpath -ldflags "-s -w -buildid=" ./main
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -o xray -trimpath -buildvcs=false -gcflags="all=-l=4" -ldflags "-s -w -buildid=" ./main
 
 # Download geodat into a staging directory
 ADD https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/geoip.dat /tmp/geodat/geoip.dat

From b8d66394aeda0c402a90ce93469a2df7e892363e Mon Sep 17 00:00:00 2001
From: Meow <197331664+Meo597@users.noreply.github.com>
Date: Mon, 18 Aug 2025 01:20:08 +0800
Subject: [PATCH 2/4] Update Dockerfile.usa

---
 .github/docker/Dockerfile.usa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/docker/Dockerfile.usa b/.github/docker/Dockerfile.usa
index b307bc4b10ec..8f5ffea5efd3 100644
--- a/.github/docker/Dockerfile.usa
+++ b/.github/docker/Dockerfile.usa
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:latest
-FROM --platform=$BUILDPLATFORM golang:latest AS build
+FROM --platform=$BUILDPLATFORM golang:1.25 AS build
 
 # Build xray-core
 WORKDIR /src
 COPY . .
 ARG TARGETOS
 ARG TARGETARCH
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -o xray -trimpath -ldflags "-s -w -buildid=" ./main
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -o xray -trimpath -buildvcs=false -gcflags="all=-l=4" -ldflags "-s -w -buildid=" ./main
 
 # Download geodat into a staging directory
 ADD https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/geoip.dat /tmp/geodat/geoip.dat

From 4d0f6bcf49e264b179bf2451f7ae8f1cca40fede Mon Sep 17 00:00:00 2001
From: Meow <197331664+Meo597@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:16:56 +0800
Subject: [PATCH 3/4] Update Golang base image to latest version

---
 .github/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
index a8a83619b146..867e671a99ae 100644
--- a/.github/docker/Dockerfile
+++ b/.github/docker/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM --platform=$BUILDPLATFORM golang:1.25 AS build
+FROM --platform=$BUILDPLATFORM golang:latest AS build
 
 # Build xray-core
 WORKDIR /src

From d047aa593720f8552fc634ef5d7a0193f4b06ace Mon Sep 17 00:00:00 2001
From: Meow <197331664+Meo597@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:17:15 +0800
Subject: [PATCH 4/4] Update Golang version in Dockerfile.usa

---
 .github/docker/Dockerfile.usa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/docker/Dockerfile.usa b/.github/docker/Dockerfile.usa
index 8f5ffea5efd3..80cc523aa247 100644
--- a/.github/docker/Dockerfile.usa
+++ b/.github/docker/Dockerfile.usa
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM --platform=$BUILDPLATFORM golang:1.25 AS build
+FROM --platform=$BUILDPLATFORM golang:latest AS build
 
 # Build xray-core
 WORKDIR /src