Skip to content

Commit 42bf385

Browse files
Merge pull request #1179 from openshift-bot/art-consistency-openshift-4.15-ose-machine-api-operator
OCPBUGS-24151: Updating ose-machine-api-operator-container image to be consistent with ART
2 parents 94f4c94 + 75714cd commit 42bf385

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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/machine-api-operator
33
COPY . .
44
RUN NO_DOCKER=1 make build
55

6-
FROM registry.ci.openshift.org/ocp/4.15:base
6+
FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
77
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/install manifests
88
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator .
99
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/nodelink-controller .

0 commit comments

Comments
 (0)