Skip to content

Commit

Permalink
chore: update golang version to v1.23.0 (#3609)
Browse files Browse the repository at this point in the history
Signed-off-by: Gaius <gaius.qi@gmail.com>
  • Loading branch information
gaius-qi authored Oct 29, 2024
1 parent 90d2017 commit 4a791c7
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 16 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/images/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/images/dfdaemon/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/images/manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/images/scheduler/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/plugin-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.4-alpine3.17
FROM golang:1.23.0-alpine3.20

ARG GOPROXY
ARG GOTAGS
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion hack/docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`}
Expand Down
2 changes: 1 addition & 1 deletion test/tools/no-content-length/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/

Expand Down

0 comments on commit 4a791c7

Please sign in to comment.