From d41711b20b2d95937ab06fe36274abebc6497917 Mon Sep 17 00:00:00 2001 From: Gaius Date: Tue, 15 Oct 2024 12:29:26 +0800 Subject: [PATCH] chore: update go version to v1.22.4 Signed-off-by: Gaius --- .github/workflows/check-size.yml | 3 --- .github/workflows/e2e-v1-nydus.yml | 1 - .github/workflows/e2e-v2-nydus.yml | 1 - .github/workflows/lint.yml | 3 --- build/images/base/Dockerfile | 4 ++-- build/images/dfdaemon/Dockerfile | 2 +- build/images/manager/Dockerfile | 2 +- build/images/scheduler/Dockerfile | 2 +- build/plugin-builder/Dockerfile | 2 +- go.mod | 2 +- test/tools/no-content-length/Dockerfile | 2 +- 11 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/check-size.yml b/.github/workflows/check-size.yml index 2974a5a93e9..5dc9096f103 100644 --- a/.github/workflows/check-size.yml +++ b/.github/workflows/check-size.yml @@ -9,9 +9,6 @@ on: permissions: contents: read -env: - GO_VERSION: '1.21' - jobs: check_size: name: Check Size diff --git a/.github/workflows/e2e-v1-nydus.yml b/.github/workflows/e2e-v1-nydus.yml index 6ce1fa547a4..b5011f6fc12 100644 --- a/.github/workflows/e2e-v1-nydus.yml +++ b/.github/workflows/e2e-v1-nydus.yml @@ -14,7 +14,6 @@ permissions: contents: read env: - GO_VERSION: '1.21' KIND_VERSION: v0.12.0 CONTAINERD_VERSION: v1.5.2 NERDCTL_VER: 0.22.2 diff --git a/.github/workflows/e2e-v2-nydus.yml b/.github/workflows/e2e-v2-nydus.yml index 6dc686d5eb2..3bef9bb804d 100644 --- a/.github/workflows/e2e-v2-nydus.yml +++ b/.github/workflows/e2e-v2-nydus.yml @@ -14,7 +14,6 @@ permissions: contents: read env: - GO_VERSION: '1.21' KIND_VERSION: v0.12.0 CONTAINERD_VERSION: v1.5.2 NERDCTL_VER: 0.22.2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 95baacb99b8..c85370a48fe 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,9 +9,6 @@ on: permissions: contents: read -env: - GO_VERSION: '1.21' - jobs: lint: name: Lint diff --git a/build/images/base/Dockerfile b/build/images/base/Dockerfile index 54ed163ff2e..bd48f081969 100644 --- a/build/images/base/Dockerfile +++ b/build/images/base/Dockerfile @@ -11,8 +11,8 @@ RUN apt-get update \ ENV PATH=/go/bin:/usr/local/go/bin:$PATH ENV GOPATH=/go -ENV GOLANG_VERSION 1.21.1 -ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go1.21.1.linux-amd64.tar.gz +ENV GOLANG_VERSION 1.22.4 +ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go1.22.4.linux-amd64.tar.gz ENV GOLANG_DOWNLOAD_SHA256 000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02 ARG GOPROXY diff --git a/build/images/dfdaemon/Dockerfile b/build/images/dfdaemon/Dockerfile index 8933868034b..04718d34ef0 100644 --- a/build/images/dfdaemon/Dockerfile +++ b/build/images/dfdaemon/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.17 -FROM golang:1.21.1-alpine3.17 AS builder +FROM golang:1.22.4-alpine3.17 AS builder ARG GOPROXY ARG GOTAGS diff --git a/build/images/manager/Dockerfile b/build/images/manager/Dockerfile index e207127c415..0d0cff537a2 100644 --- a/build/images/manager/Dockerfile +++ b/build/images/manager/Dockerfile @@ -12,7 +12,7 @@ COPY ./manager/console /build RUN yarn build -FROM golang:1.21.1-alpine3.17 AS server-builder +FROM golang:1.22.4-alpine3.17 AS server-builder ARG GOPROXY ARG GOTAGS diff --git a/build/images/scheduler/Dockerfile b/build/images/scheduler/Dockerfile index 24a87cbeeb8..670535e90d1 100644 --- a/build/images/scheduler/Dockerfile +++ b/build/images/scheduler/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.17 -FROM golang:1.21.1-alpine3.17 AS builder +FROM golang:1.22.4-alpine3.17 AS builder ARG GOPROXY ARG GOTAGS diff --git a/build/plugin-builder/Dockerfile b/build/plugin-builder/Dockerfile index 06e129e89b1..ee54a5d2312 100644 --- a/build/plugin-builder/Dockerfile +++ b/build/plugin-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1-alpine3.17 +FROM golang:1.22.4-alpine3.17 ARG GOPROXY ARG GOTAGS diff --git a/go.mod b/go.mod index 42d5537c41c..abf968473af 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module d7y.io/dragonfly/v2 -go 1.21 +go 1.22.4 require ( d7y.io/api/v2 v2.0.167 diff --git a/test/tools/no-content-length/Dockerfile b/test/tools/no-content-length/Dockerfile index 3a559d35459..52a752d5dc3 100644 --- a/test/tools/no-content-length/Dockerfile +++ b/test/tools/no-content-length/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.17 -FROM golang:1.21.1-alpine3.17 AS builder +FROM golang:1.22.4-alpine3.17 AS builder COPY . /go/src/