Skip to content

Commit 08c0459

Browse files
Merge pull request #1000 from openshift-bot/art-consistency-openshift-4.15-cluster-version-operator
OCPBUGS-24138: NO-JIRA: Updating cluster-version-operator-container image to be consistent with ART
2 parents d32dad9 + e3d32fa commit 08c0459

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.ci-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.20-openshift-4.15
4+
tag: rhel-9-release-golang-1.20-openshift-4.15

Dockerfile.rhel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-version-operator
33
COPY . .
44
RUN hack/build-go.sh; \
55
mkdir -p /tmp/build; \
66
cp _output/linux/$(go env GOARCH)/cluster-version-operator /tmp/build/cluster-version-operator
77

8-
FROM registry.ci.openshift.org/ocp/4.15:base
8+
FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
99
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
1010
COPY install /manifests
1111
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/

0 commit comments

Comments
 (0)