diff --git a/Dockerfile b/Dockerfile index 623b2a5ed..598d8acb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 as builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 as builder ARG TARGETOS ARG TARGETARCH diff --git a/Dockerfile.konflux b/Dockerfile.konflux index e868bf953..3d2e4fba5 100644 --- a/Dockerfile.konflux +++ b/Dockerfile.konflux @@ -1,4 +1,4 @@ -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.25 as builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.26 as builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index 9452aaeea..32948150d 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/openshift/image-based-install-operator -go 1.25.0 +go 1.26.0 -toolchain go1.25.5 +toolchain go1.26.2 require ( github.com/containers/image/v5 v5.31.0 diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh index 8ea7c7857..df48cd560 100755 --- a/hack/golangci-lint.sh +++ b/hack/golangci-lint.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="2.8.0" +VERSION="2.11.4" rootdir=$(git rev-parse --show-toplevel) if [ -z "${rootdir}" ]; then