From 23099c3bfe5b52fead764c10c70b17803baaed89 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 7 Nov 2024 11:52:43 +0800 Subject: [PATCH] chore: update go version of building files --- hack/dockerfiles/release/Dockerfile.node-servant | 2 +- hack/dockerfiles/release/Dockerfile.yurt-iot-dock | 2 +- hack/dockerfiles/release/Dockerfile.yurt-manager | 2 +- hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent | 2 +- hack/dockerfiles/release/Dockerfile.yurt-tunnel-server | 2 +- hack/dockerfiles/release/Dockerfile.yurthub | 2 +- hack/make-rules/image_build.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/dockerfiles/release/Dockerfile.node-servant b/hack/dockerfiles/release/Dockerfile.node-servant index 0684cc82811..48aac6a26db 100644 --- a/hack/dockerfiles/release/Dockerfile.node-servant +++ b/hack/dockerfiles/release/Dockerfile.node-servant @@ -1,6 +1,6 @@ # multi-arch image building for yurt-node-servant -FROM --platform=${BUILDPLATFORM} golang:1.20 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22.3 as builder ADD . /build ARG TARGETOS TARGETARCH IMAGE_TAG GOPROXY MIRROR_REPO WORKDIR /build/ diff --git a/hack/dockerfiles/release/Dockerfile.yurt-iot-dock b/hack/dockerfiles/release/Dockerfile.yurt-iot-dock index 53eb77b8986..94025224feb 100644 --- a/hack/dockerfiles/release/Dockerfile.yurt-iot-dock +++ b/hack/dockerfiles/release/Dockerfile.yurt-iot-dock @@ -1,6 +1,6 @@ # multi-arch image building for yurt-iot-dock -FROM --platform=${BUILDPLATFORM} golang:1.20 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22.3 as builder ADD . /build ARG TARGETOS TARGETARCH IMAGE_TAG GOPROXY MIRROR_REPO WORKDIR /build/ diff --git a/hack/dockerfiles/release/Dockerfile.yurt-manager b/hack/dockerfiles/release/Dockerfile.yurt-manager index 414f2ebef10..fa0b4ec4909 100644 --- a/hack/dockerfiles/release/Dockerfile.yurt-manager +++ b/hack/dockerfiles/release/Dockerfile.yurt-manager @@ -1,6 +1,6 @@ # multi-arch image building for yurt-tunnel-server -FROM --platform=${BUILDPLATFORM} golang:1.20 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22.3 as builder ADD . /build ARG TARGETOS TARGETARCH IMAGE_TAG GOPROXY MIRROR_REPO WORKDIR /build/ diff --git a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent index 83feb707337..7c5d9bd41a3 100644 --- a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent +++ b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent @@ -1,6 +1,6 @@ # multi-arch image building for yurt-tunnel-agent -FROM --platform=${BUILDPLATFORM} golang:1.20 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22.3 as builder ADD . /build ARG TARGETOS TARGETARCH IMAGE_TAG GOPROXY MIRROR_REPO WORKDIR /build/ diff --git a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server index 57f38591bf2..705a9269450 100644 --- a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server +++ b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server @@ -1,6 +1,6 @@ # multi-arch image building for yurt-tunnel-server -FROM --platform=${BUILDPLATFORM} golang:1.20 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22.3 as builder ADD . /build ARG TARGETOS TARGETARCH IMAGE_TAG GOPROXY MIRROR_REPO WORKDIR /build/ diff --git a/hack/dockerfiles/release/Dockerfile.yurthub b/hack/dockerfiles/release/Dockerfile.yurthub index fcbf28dd9e5..fd736d6d188 100644 --- a/hack/dockerfiles/release/Dockerfile.yurthub +++ b/hack/dockerfiles/release/Dockerfile.yurthub @@ -1,6 +1,6 @@ # multi-arch image building for yurthub -FROM --platform=${BUILDPLATFORM} golang:1.20 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22.3 as builder ADD . /build ARG TARGETOS TARGETARCH IMAGE_TAG GOPROXY MIRROR_REPO WORKDIR /build/ diff --git a/hack/make-rules/image_build.sh b/hack/make-rules/image_build.sh index 8029dccaa0b..c50c24cd2fe 100755 --- a/hack/make-rules/image_build.sh +++ b/hack/make-rules/image_build.sh @@ -36,7 +36,7 @@ IMAGE_REPO=${IMAGE_REPO:-"openyurt"} IMAGE_TAG=${IMAGE_TAG:-$(get_image_tag)} DOCKER_BUILD_ARGS="" DOCKER_EXTRA_ENVS="" -BUILD_BASE_IMAGE="golang:1.20" +BUILD_BASE_IMAGE="golang:1.22.3" BUILD_GOPROXY=$(go env GOPROXY) GOPROXY_CN="https://goproxy.cn" APKREPO_MIRROR_CN="mirrors.aliyun.com"