From d31cf13804fc6aa094b98ebe0c41bc1f656f30e1 Mon Sep 17 00:00:00 2001 From: crozzy Date: Thu, 19 Sep 2024 11:29:04 -0700 Subject: [PATCH] chore: update go version to 1.22 Update all go.mod files to use 1.22, and update the peripherals (release workflow, docker files). Signed-off-by: crozzy --- .github/workflows/cut-release.yml | 2 +- Dockerfile | 2 +- config/go.mod | 2 +- docker-compose.yaml | 2 +- go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cut-release.yml b/.github/workflows/cut-release.yml index 35cfa3dbc1..b58929e3e2 100644 --- a/.github/workflows/cut-release.yml +++ b/.github/workflows/cut-release.yml @@ -13,7 +13,7 @@ jobs: runs-on: 'ubuntu-latest' strategy: matrix: - image: ['quay.io/projectquay/golang:1.21'] + image: ['quay.io/projectquay/golang:1.22'] container: image: ${{ matrix.image }} outputs: diff --git a/Dockerfile b/Dockerfile index 9eed526c22..cf40fe6423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. ARG GOTOOLCHAIN=local -ARG GO_VERSION=1.21 +ARG GO_VERSION=1.22 FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:${GO_VERSION} AS build WORKDIR /build RUN --mount=type=cache,target=/root/.cache/go-build \ diff --git a/config/go.mod b/config/go.mod index e4569a9e2f..9b7ad800f4 100644 --- a/config/go.mod +++ b/config/go.mod @@ -1,5 +1,5 @@ module github.com/quay/clair/config -go 1.21.9 +go 1.22 require github.com/google/go-cmp v0.6.0 diff --git a/docker-compose.yaml b/docker-compose.yaml index 853a070c18..1f5f152151 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ version: "3.7" # This is just to hold a bunch of yaml anchors and try to consolidate parts of # the config. x-anchors: - go: &go-image quay.io/projectquay/golang:1.21 + go: &go-image quay.io/projectquay/golang:1.22 grafana: &grafana-image docker.io/grafana/grafana:8.0.3 jaeger: &jaeger-image docker.io/jaegertracing/all-in-one:1.26 pgadmin: &pgadmin-image docker.io/dpage/pgadmin4:5.7 diff --git a/go.mod b/go.mod index c07423a8b1..f276c62919 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/quay/clair/v4 -go 1.21.9 +go 1.22 require ( github.com/Masterminds/semver v1.5.0