diff --git a/.tool-versions b/.tool-versions index 93fe5c1b5..0767b00de 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.26.7 +golang 1.26.10 diff --git a/Dockerfile b/Dockerfile index 1ab91de7f..f28bf1605 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ## Build -FROM docker.io/library/golang:1.26.7@sha256:e30143be198ab04cf7ba25fba83ab3a692ca584c994aad0bf131fa0eb32dd8c1 AS build +FROM docker.io/library/golang:1.26.10@sha256:cfa27959837144bf4649802ba38e59daffd0dd2a7994aa83daaf113285b0f551 AS build ARG TARGETOS ARG TARGETARCH @@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}" ## Final image -FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:baafce2d34783a28b4a472779f304e97e00f9d35c99553bc53b068b14344d9a9 +FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:08d4c70f1baf6537a0728656cf7942d561e74a35916509d205b6519861266352 ARG TARGETOS ARG TARGETARCH diff --git a/Dockerfile.dist b/Dockerfile.dist index b183cfabe..af5661a94 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -16,7 +16,7 @@ ## Build -FROM registry.access.redhat.com/ubi9/go-toolset:1.26.7@sha256:685ccca486cc2c82b0818d835abecb1aed7a396e76ba416cfc47c28067f5d365 AS build +FROM registry.access.redhat.com/ubi9/go-toolset:1.26.10@sha256:0e3894cea4fc077084245e8aa2befc8a7d91a4f60fbf850f0b5b555cbe62ee26 AS build ARG TARGETOS ARG TARGETARCH @@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}" ## Final image -FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:baafce2d34783a28b4a472779f304e97e00f9d35c99553bc53b068b14344d9a9 +FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:08d4c70f1baf6537a0728656cf7942d561e74a35916509d205b6519861266352 ARG TARGETOS ARG TARGETARCH diff --git a/acceptance/go.mod b/acceptance/go.mod index 581839775..eae8f3aa3 100644 --- a/acceptance/go.mod +++ b/acceptance/go.mod @@ -1,6 +1,6 @@ module github.com/conforma/cli/acceptance -go 1.26.7 +go 1.26.10 require ( cuelang.org/go v0.16.0 diff --git a/acceptance/kubernetes/kind/acceptance.Dockerfile b/acceptance/kubernetes/kind/acceptance.Dockerfile index 1359347ff..140bc7cb6 100644 --- a/acceptance/kubernetes/kind/acceptance.Dockerfile +++ b/acceptance/kubernetes/kind/acceptance.Dockerfile @@ -17,7 +17,7 @@ # Minimal image for acceptance tests. The ec and kubectl binaries are # pre-built on the host and injected here to avoid the multi-stage Go # compilation that the production Dockerfile uses. -FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:baafce2d34783a28b4a472779f304e97e00f9d35c99553bc53b068b14344d9a9 +FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:08d4c70f1baf6537a0728656cf7942d561e74a35916509d205b6519861266352 RUN microdnf upgrade --assumeyes --nodocs --setopt=keepcache=0 --refresh && microdnf -y --nodocs --setopt=keepcache=0 install gzip jq ca-certificates diff --git a/go.mod b/go.mod index 898d68759..503089b43 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/conforma/cli -go 1.26.7 +go 1.26.10 require ( cuelang.org/go v0.16.0 @@ -157,7 +157,7 @@ require ( github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect github.com/cockroachdb/apd/v3 v3.2.1 // indirect github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect - github.com/containerd/containerd/v2 v2.3.4 // indirect + github.com/containerd/containerd/v2 v2.3.7 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect diff --git a/go.sum b/go.sum index 8da912a60..4d08caa25 100644 --- a/go.sum +++ b/go.sum @@ -329,8 +329,8 @@ github.com/conforma/go-containerregistry v0.21.8-0.20260702142841-f9eefe19c7b2 h github.com/conforma/go-containerregistry v0.21.8-0.20260702142841-f9eefe19c7b2/go.mod h1:oCPfU4CuHJHCjfKVdKys7ovSiqtwwGHqUC07pRYh+f8= github.com/conforma/go-gather v1.2.0 h1:HYmUtkGPQRUOb2mEBQ51FTSO0SpZ//12mNp2AXcVxBs= github.com/conforma/go-gather v1.2.0/go.mod h1:7LbJh5AAljGbOoUWQy+wBKu7MKecyG45bLbbe7Bo0/A= -github.com/containerd/containerd/v2 v2.3.4 h1:c2PJo/9UGVdiiw8SwrxuLxWGY+9b3jQ6Xp9zntneIvI= -github.com/containerd/containerd/v2 v2.3.4/go.mod h1:a30D8fWZJ1Uzx/2WpjLbLsxBkq9He41pe8ENW+QZ3LY= +github.com/containerd/containerd/v2 v2.3.7 h1:7PGbgAVKE4ieQjFPv7+kwAv7f9dCtRpExZwjExHD/Fk= +github.com/containerd/containerd/v2 v2.3.7/go.mod h1:usc1tgzxnUlhLLW9KLqTEKRTSix46fIc6XHDZt4Tlrs= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= diff --git a/tools/go.mod b/tools/go.mod index 100e6bb2d..78c9e89bf 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/conforma/cli/tools -go 1.26.7 +go 1.26.10 require ( github.com/daixiang0/gci v0.13.7 diff --git a/tools/kubectl/go.mod b/tools/kubectl/go.mod index ab9f115f5..0953cf5f2 100644 --- a/tools/kubectl/go.mod +++ b/tools/kubectl/go.mod @@ -1,6 +1,6 @@ module github.com/conforma/cli/tools/kubectl -go 1.26.7 +go 1.26.10 require k8s.io/kubernetes v1.34.2