diff --git a/.golangci.yml b/.golangci.yml index 5fa70d0fa..886f2a4ee 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,7 @@ run: timeout: 16m modules-download-mode: readonly - go: "1.23" + go: "1.26" output: formats: diff --git a/go.mod b/go.mod index 3de9ec114..6759b0675 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/stackrox/scanner -go 1.24.0 +go 1.26.0 -toolchain go1.24.4 +toolchain go1.26.3 require ( cloud.google.com/go/storage v1.56.1 diff --git a/image/scanner/rhel/konflux.Dockerfile b/image/scanner/rhel/konflux.Dockerfile index 4af62bc73..b450696fa 100644 --- a/image/scanner/rhel/konflux.Dockerfile +++ b/image/scanner/rhel/konflux.Dockerfile @@ -1,5 +1,5 @@ # Compiling scanner binaries and staging repo2cpe and genesis manifests -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.24@sha256:89a421ef4cecc6eb5c2fc347ab49aa094ebbeff6df8ba05ab19ccb28efa63f79 AS builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.26@sha256:aa2429f5dcf086b4edb2251f0cea19d54c60638aaedc03a1384d26ec3754cebc AS builder ARG SCANNER_TAG RUN if [[ "$SCANNER_TAG" == "" ]]; then >&2 echo "error: required SCANNER_TAG arg is unset"; exit 6; fi diff --git a/tools/linters/go.mod b/tools/linters/go.mod index e29fbd691..aac866d97 100644 --- a/tools/linters/go.mod +++ b/tools/linters/go.mod @@ -1,6 +1,6 @@ module github.com/stackrox/scanner/tools/linters -go 1.24 +go 1.26 require ( github.com/golangci/golangci-lint v1.64.8 diff --git a/tools/test/go.mod b/tools/test/go.mod index 8c8e753fe..2407ec665 100644 --- a/tools/test/go.mod +++ b/tools/test/go.mod @@ -1,5 +1,5 @@ module github.com/stackrox/scanner/tools/test -go 1.24 +go 1.26 require github.com/jstemmer/go-junit-report/v2 v2.1.0