diff --git a/.github/workflows/code.analysis.yml b/.github/workflows/code.analysis.yml index 0a755475ce..9d61bde39a 100644 --- a/.github/workflows/code.analysis.yml +++ b/.github/workflows/code.analysis.yml @@ -11,7 +11,7 @@ on: - ".github/workflows/code.analysis.yml" env: - GO_VERSION: 1.19 + GO_VERSION: "1.20" jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c579d5da3..52bde6d83d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: - "v*" env: - GO_VERSION: 1.19 + GO_VERSION: "1.20" permissions: contents: write diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea8eb41bae..d673d15964 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ on: - ".github/workflows/test.yml" env: - GO_VERSION: 1.19 + GO_VERSION: "1.20" jobs: test: diff --git a/Makefile b/Makefile index 5c31460134..9a239806a4 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ build_docker: docker run -w /egsrc -u ${shell id -u}:${shell id -g} --rm \ -v ${GO_PATH}:/gopath -v ${MKFILE_DIR}:/egsrc -v ${MKFILE_DIR}build/cache:/gocache \ -e GOPROXY=https://goproxy.io,direct -e GOCACHE=/gocache -e GOPATH=/gopath \ - megaease/golang:1.20-alpine make build DOCKER=true + megaease/golang:1.21.0-alpine make build DOCKER=true docker buildx build --platform linux/amd64 --load -t ${IMAGE_NAME}:${RELEASE} -f ./build/package/Dockerfile . docker tag ${IMAGE_NAME}:${RELEASE} ${IMAGE_NAME}:latest docker tag ${IMAGE_NAME}:latest ${IMAGE_NAME}:server-sidecar diff --git a/README.md b/README.md index f4aabb9148..b82155b84e 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ make > **Note**: > -> - This repo requires Go 1.19+ compiler for the build. +> - This repo requires Go 1.20+ compiler for the build. > - If you need the WebAssembly feature, please run `make wasm`. Then we can add the binary directory to the `PATH` and execute the server: diff --git a/README.zh-CN.md b/README.zh-CN.md index 46de0c04bc..71c553c2f7 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -154,7 +154,7 @@ make > **注意事项**: > -> - 我们需要 Go 1.19 以上版本的编译器 +> - 我们需要 Go 1.20 以上版本的编译器 > - 如果需要支持 WebAssembly 的版本,你需要运行 `make wasm` 然后把二进制所在目录添加到 `PATH` 中,并启动服务: diff --git a/build/package/Dockerfile b/build/package/Dockerfile index 947e7660a4..bf12ce5adb 100644 --- a/build/package/Dockerfile +++ b/build/package/Dockerfile @@ -5,7 +5,7 @@ # # To build docker images from this file, please build with command: # make build_docker -FROM alpine:3.17 +FROM alpine:3.18 WORKDIR /opt/easegress diff --git a/build/package/Dockerfile.builder b/build/package/Dockerfile.builder index bdecee4b89..12068842b4 100644 --- a/build/package/Dockerfile.builder +++ b/build/package/Dockerfile.builder @@ -1,2 +1,2 @@ -FROM golang:1.20-alpine +FROM golang:1.21.0-alpine RUN apk --no-cache add make git diff --git a/build/package/Dockerfile.goreleaser b/build/package/Dockerfile.goreleaser index 667376bc54..a850d509a7 100644 --- a/build/package/Dockerfile.goreleaser +++ b/build/package/Dockerfile.goreleaser @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.18 WORKDIR /opt/easegress diff --git a/go.mod b/go.mod index 1c5519d84e..0f1e57d586 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/megaease/easegress/v2 -go 1.19 +go 1.20 require ( github.com/ArthurHlt/go-eureka-client v1.1.0 @@ -43,7 +43,7 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/prometheus/client_golang v1.14.0 - github.com/quic-go/quic-go v0.36.1 + github.com/quic-go/quic-go v0.37.4 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/rs/cors v1.9.0 github.com/spf13/cobra v1.7.0 @@ -106,8 +106,7 @@ require ( github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/qtls-go1-19 v0.3.2 // indirect - github.com/quic-go/qtls-go1-20 v0.2.2 // indirect + github.com/quic-go/qtls-go1-20 v0.3.1 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/tchap/go-patricia/v2 v2.3.1 // indirect github.com/vultr/govultr/v3 v3.0.2 // indirect diff --git a/go.sum b/go.sum index c3392219af..3252651309 100644 --- a/go.sum +++ b/go.sum @@ -696,12 +696,10 @@ github.com/prometheus/statsd_exporter v0.23.0 h1:GEkriUCmARYh1gSA0gzpvmTg/oHMc5M github.com/prometheus/statsd_exporter v0.23.0/go.mod h1:1itCY9XMa2p5pjO5HseGjs5cnaIA5qxLCYmn3OUna58= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U= -github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= -github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E= -github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= -github.com/quic-go/quic-go v0.36.1 h1:WsG73nVtnDy1TiACxFxhQ3TqaW+DipmqzLEtNlAwZyY= -github.com/quic-go/quic-go v0.36.1/go.mod h1:zPetvwDlILVxt15n3hr3Gf/I3mDf7LpLKPhR4Ez0AZQ= +github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg= +github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= +github.com/quic-go/quic-go v0.37.4 h1:ke8B73yMCWGq9MfrCCAw0Uzdm7GaViC3i39dsIdDlH4= +github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rickb777/date v1.20.1 h1:7MzSOc42Hbr5UXiQOihAAXoYDoeyzr0Hwvt+hCjBDV4=