From 64d52969f36829d1fd280f55937855762abeaea2 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Tue, 16 Jun 2026 14:17:25 +0800 Subject: [PATCH 1/2] build: bump go to 1.26 and golang base images to 1.26.4 --- docker/Dockerfile | 2 +- go.mod | 2 +- test/e2e/base/satellite/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 041ce5b0..8679d04d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.26.3 AS build +FROM golang:1.26.4 AS build ARG VERSION="latest" ARG TARGETARCH diff --git a/go.mod b/go.mod index f51b2f5d..2b0def33 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/apache/skywalking-satellite -go 1.25.0 +go 1.26.0 toolchain go1.26.4 diff --git a/test/e2e/base/satellite/Dockerfile b/test/e2e/base/satellite/Dockerfile index 466a04f6..95345826 100644 --- a/test/e2e/base/satellite/Dockerfile +++ b/test/e2e/base/satellite/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.25 +FROM golang:1.26 ADD . /satellite_code WORKDIR /satellite_code From 538a8e513ea3357e52179b72bd947db166a1a974 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Tue, 16 Jun 2026 14:22:05 +0800 Subject: [PATCH 2/2] build: pin e2e satellite base image to golang:1.26.4 --- test/e2e/base/satellite/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/base/satellite/Dockerfile b/test/e2e/base/satellite/Dockerfile index 95345826..b128a2d6 100644 --- a/test/e2e/base/satellite/Dockerfile +++ b/test/e2e/base/satellite/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.26 +FROM golang:1.26.4 ADD . /satellite_code WORKDIR /satellite_code