Merge branch 'release-2.12' into automated-updates-acm-release-2.12

stolostron · Sep 4, 2024 · e8529c8 · e8529c8
2 parents 9be40da + a71bab0
commit e8529c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Containerfile.operator b/Containerfile.operator
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 # Licensed under the Apache License 2.0
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21 AS builder
 
 WORKDIR $GOPATH/src/github.com/thanos-io/thanos
 

diff --git a/Dockerfile.prow b/Dockerfile.prow
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/stolostron/builder:go1.22-linux as builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux as builder
 
 WORKDIR $GOPATH/src/github.com/thanos-io/thanos