diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c5579b8b8c5..c5c4546f06c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,15 +16,12 @@ jobs: timeout-minutes: 30 steps: - name: Checkout code - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: - go-version-file: go.mod - cache: false + fetch-depth: '0' - name: Golangci lint - uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 + uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 with: version: v1.54 args: --verbose diff --git a/build/images/base/Dockerfile b/build/images/base/Dockerfile index bd48f081969..603bcd14f19 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.22.4 -ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go1.22.4.linux-amd64.tar.gz +ENV GOLANG_VERSION 1.23.0 +ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go1.23.0.linux-amd64.tar.gz ENV GOLANG_DOWNLOAD_SHA256 000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02 ARG GOPROXY diff --git a/build/images/dfdaemon/Dockerfile b/build/images/dfdaemon/Dockerfile index e3684b53751..ba7166f780f 100644 --- a/build/images/dfdaemon/Dockerfile +++ b/build/images/dfdaemon/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.20 -FROM golang:1.22.4-alpine3.20 AS builder +FROM golang:1.23.0-alpine3.20 AS builder ARG GOPROXY ARG GOTAGS diff --git a/build/images/manager/Dockerfile b/build/images/manager/Dockerfile index 5f21dc73db4..2eeb27d7870 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.22.4-alpine3.20 AS server-builder +FROM golang:1.23.0-alpine3.20 AS server-builder ARG GOPROXY ARG GOTAGS diff --git a/build/images/scheduler/Dockerfile b/build/images/scheduler/Dockerfile index 0548432746c..0e225daeb2e 100644 --- a/build/images/scheduler/Dockerfile +++ b/build/images/scheduler/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.20 -FROM golang:1.22.4-alpine3.20 AS builder +FROM golang:1.23.0-alpine3.20 AS builder ARG GOPROXY ARG GOTAGS diff --git a/build/plugin-builder/Dockerfile b/build/plugin-builder/Dockerfile index ee54a5d2312..3c26e7c3e7c 100644 --- a/build/plugin-builder/Dockerfile +++ b/build/plugin-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4-alpine3.17 +FROM golang:1.23.0-alpine3.20 ARG GOPROXY ARG GOTAGS diff --git a/go.mod b/go.mod index 1ccfd4e7a86..397ca3d407b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module d7y.io/dragonfly/v2 -go 1.22.4 +go 1.23.0 require ( d7y.io/api/v2 v2.0.167 diff --git a/hack/build.sh b/hack/build.sh index ea946a08c30..cb50312cc20 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -11,7 +11,7 @@ SCHEDULER_BINARY_NAME=scheduler MANAGER_BINARY_NAME=manager PKG=d7y.io/dragonfly/v2 -BUILD_IMAGE=golang:1.21.1-alpine3.17 +BUILD_IMAGE=golang:1.23.0-alpine3.20 VERSION=$(git rev-parse --short HEAD) BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') diff --git a/hack/docker-build.sh b/hack/docker-build.sh index bd6f413c962..6afadb738d6 100755 --- a/hack/docker-build.sh +++ b/hack/docker-build.sh @@ -10,7 +10,7 @@ cd "${curDir}/../" || return D7Y_VERSION=${D7Y_VERSION:-"latest"} D7Y_REGISTRY=${D7Y_REGISTRY:-dragonflyoss} IMAGES_DIR="build/images" -BASE_IMAGE=${BASE_IMAGE:-alpine:3.17} +BASE_IMAGE=${BASE_IMAGE:-alpine:3.20} CGO_ENABLED=${CGO_ENABLED:-0} GOPROXY=${GOPROXY:-`go env GOPROXY`} diff --git a/test/tools/no-content-length/Dockerfile b/test/tools/no-content-length/Dockerfile index 0de57dc1628..a341e2b2a50 100644 --- a/test/tools/no-content-length/Dockerfile +++ b/test/tools/no-content-length/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.20 -FROM golang:1.22.4-alpine3.20 AS builder +FROM golang:1.23.0-alpine3.20 AS builder COPY . /go/src/