diff --git a/.github/workflows/check-size.yml b/.github/workflows/check-size.yml index ca20c85f5..f53dc995d 100644 --- a/.github/workflows/check-size.yml +++ b/.github/workflows/check-size.yml @@ -7,7 +7,7 @@ on: branches: [ main, release-* ] env: - GO_VERSION: 1.18 + GO_VERSION: 1.19 jobs: check_size: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 201b812cf..96bb24501 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: - cron: '0 4 * * *' env: - GO_VERSION: 1.18 + GO_VERSION: 1.19 jobs: test: diff --git a/.github/workflows/compatibility-e2e.yml b/.github/workflows/compatibility-e2e.yml index fbf4dc0ff..d61e338e1 100644 --- a/.github/workflows/compatibility-e2e.yml +++ b/.github/workflows/compatibility-e2e.yml @@ -11,7 +11,7 @@ on: - cron: '0 4 * * *' env: - GO_VERSION: 1.18 + GO_VERSION: 1.19 KIND_VERSION: v0.12.0 CONTAINERD_VERSION: v1.5.2 KIND_CONFIG_PATH: test/testdata/kind/config.yaml diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 96c1e5392..422c53271 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -11,7 +11,7 @@ on: - cron: '0 4 * * *' env: - GO_VERSION: 1.18 + GO_VERSION: 1.19 KIND_VERSION: v0.12.0 CONTAINERD_VERSION: v1.5.2 KIND_CONFIG_PATH: test/testdata/kind/config.yaml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f138046a6..d9226c4f3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ on: branches: [ main, release-* ] env: - GO_VERSION: 1.18 + GO_VERSION: 1.19 jobs: lint: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbe793774..ab0b399e7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Build manager console assets run: |- diff --git a/build/images/base/Dockerfile b/build/images/base/Dockerfile index 50ee0fc8b..78a47a65b 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.18.3 -ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz +ENV GOLANG_VERSION 1.19 +ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go1.19.linux-amd64.tar.gz ENV GOLANG_DOWNLOAD_SHA256 956f8507b302ab0bb747613695cdae10af99bbd39a90cae522b7c0302cc27245 ARG GOPROXY diff --git a/build/images/base/README.md b/build/images/base/README.md index 2a92bbc42..e01645409 100644 --- a/build/images/base/README.md +++ b/build/images/base/README.md @@ -5,13 +5,13 @@ ### Build Base Image ```shell -docker build -t dragonflyoss/base:bpftrace-v0.13.0-go-v1.18.3 -f Dockerfile . +docker build -t dragonflyoss/base:bpftrace-v0.13.0-go-v1.19 -f Dockerfile . ``` ### Run Debug Container ```shell -BASE_IMAGE=dragonflyoss/base:bpftrace-v0.13.0-go-v1.18.3 +BASE_IMAGE=dragonflyoss/base:bpftrace-v0.13.0-go-v1.19 # run debug container docker run -ti -v /usr/src:/usr/src:ro \ @@ -29,7 +29,7 @@ export GOTAGS="debug" # gcflags for dlv export GOGCFLAGS="all=-N -l" # base image -export BASE_IMAGE=dragonflyoss/base:bpftrace-v0.13.0-go-v1.18.3 +export BASE_IMAGE=dragonflyoss/base:bpftrace-v0.13.0-go-v1.19 make docker-build ``` diff --git a/build/images/dfdaemon/Dockerfile b/build/images/dfdaemon/Dockerfile index 03baccae5..808d76295 100644 --- a/build/images/dfdaemon/Dockerfile +++ b/build/images/dfdaemon/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.16 -FROM golang:1.18.3-alpine3.16 as builder +FROM golang:1.19-alpine3.16 as builder ARG GOPROXY ARG GOTAGS diff --git a/build/images/manager/Dockerfile b/build/images/manager/Dockerfile index d01dacd6e..6ebe5e111 100644 --- a/build/images/manager/Dockerfile +++ b/build/images/manager/Dockerfile @@ -12,7 +12,7 @@ COPY ./manager/console /build RUN npm run build -FROM golang:1.18.3-alpine3.16 as server-builder +FROM golang:1.19-alpine3.16 as server-builder ARG GOPROXY ARG GOTAGS diff --git a/build/images/scheduler/Dockerfile b/build/images/scheduler/Dockerfile index 5150079a7..598e7f054 100644 --- a/build/images/scheduler/Dockerfile +++ b/build/images/scheduler/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.16 -FROM golang:1.18.3-alpine3.16 as builder +FROM golang:1.19-alpine3.16 as builder ARG GOPROXY ARG GOTAGS diff --git a/build/plugin-builder/Dockerfile b/build/plugin-builder/Dockerfile index 81101a144..11a2ccf28 100644 --- a/build/plugin-builder/Dockerfile +++ b/build/plugin-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18.3-alpine3.16 +FROM golang:1.19-alpine3.16 ARG GOPROXY ARG GOTAGS diff --git a/go.mod b/go.mod index 41b2e3c74..a3fc430c8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module d7y.io/dragonfly/v2 -go 1.18 +go 1.19 require ( d7y.io/api v1.1.8 diff --git a/hack/build.sh b/hack/build.sh index e0838eb4b..a2690579e 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.18.3-alpine3.16 +BUILD_IMAGE=golang:1.19-alpine3.16 VERSION=$(git rev-parse --short HEAD) BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') diff --git a/test/tools/no-content-length/Dockerfile b/test/tools/no-content-length/Dockerfile index d20bc7aed..5241fa661 100644 --- a/test/tools/no-content-length/Dockerfile +++ b/test/tools/no-content-length/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.16 -FROM golang:1.18.3-alpine3.16 as builder +FROM golang:1.19-alpine3.16 as builder COPY . /go/src/