From a745fb952ca7418a59c839829e88439eea537581 Mon Sep 17 00:00:00 2001 From: duorameng <2997944583@qq.com> Date: Mon, 22 Jun 2026 19:13:31 +0800 Subject: [PATCH] build(docker): upgrade golang base image to 1.26 to match go.mod --- docker/Dockerfile | 4 ++-- docker/Dockerfile.dev | 2 +- docker/Dockerfile.minimal | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 70b583a..c473696 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,7 +37,7 @@ RUN VERSION_VAL="${VERSION:-dev-$(TZ=Asia/Shanghai date '+%Y%m%d%H%M%S')}" && \ # ================================ # Stage 2: Build backend # ================================ -FROM --platform=$BUILDPLATFORM golang:1.25 AS backend-builder +FROM --platform=$BUILDPLATFORM golang:1.26 AS backend-builder ARG TARGETOS ARG TARGETARCH @@ -80,7 +80,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ # ================================ # Stage 3: Build Agent (all platforms) # ================================ -FROM --platform=$BUILDPLATFORM golang:1.25 AS agent-builder +FROM --platform=$BUILDPLATFORM golang:1.26 AS agent-builder WORKDIR /app diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index dad1e68..84cadc5 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.25-trixie +FROM golang:1.26-trixie ENV TZ=Asia/Shanghai ENV LANG=C.UTF-8 diff --git a/docker/Dockerfile.minimal b/docker/Dockerfile.minimal index 652d33e..1b48869 100644 --- a/docker/Dockerfile.minimal +++ b/docker/Dockerfile.minimal @@ -36,7 +36,7 @@ RUN VERSION_VAL="${VERSION:-dev-$(TZ=Asia/Shanghai date '+%Y%m%d%H%M%S')}" && \ # ================================ # Stage 2: Build backend # ================================ -FROM --platform=$BUILDPLATFORM golang:1.25 AS backend-builder +FROM --platform=$BUILDPLATFORM golang:1.26 AS backend-builder ARG TARGETOS ARG TARGETARCH @@ -69,7 +69,7 @@ RUN VERSION_VAL=$(cat /build-info/version.txt) && \ # ================================ # Stage 3: Build Agent (all platforms) # ================================ -FROM --platform=$BUILDPLATFORM golang:1.25 AS agent-builder +FROM --platform=$BUILDPLATFORM golang:1.26 AS agent-builder WORKDIR /app