Skip to content

Commit 0732ce3

Browse files
author
AOS Automation Release Team
committed
Updating ose-machine-config-operator-container image to be consistent with ART for 4.22
Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-machine-config-operator.yml
1 parent 201cc31 commit 0732ce3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
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-9-release-golang-1.24-openshift-4.21
4+
tag: rhel-9-release-golang-1.24-openshift-4.22

Dockerfile.rhel7

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE IS GENERATED FROM Dockerfile DO NOT EDIT
22
# Use RHEL 9 as the primary builder base for the Machine Config Operator
3-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS rhel9-builder
3+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS rhel9-builder
44
ARG TAGS=""
55
WORKDIR /go/src/github.com/openshift/machine-config-operator
66
COPY . .
@@ -11,7 +11,7 @@ ENV GOMODCACHE="/go/rhel9/pkg/mod"
1111
RUN make install DESTDIR=./instroot-rhel9 && tar -C instroot-rhel9 -cf instroot-rhel9.tar .
1212

1313
# Add a RHEL 8 builder to compile the RHEL 8 compatible binaries
14-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.21 AS rhel8-builder
14+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.22 AS rhel8-builder
1515
ARG TAGS=""
1616
WORKDIR /go/src/github.com/openshift/machine-config-operator
1717
# Copy the RHEL 8 machine-config-daemon binary and rename
@@ -20,7 +20,7 @@ ENV GOCACHE="/go/rhel8/.cache"
2020
ENV GOMODCACHE="/go/rhel8/pkg/mod"
2121
RUN make install DESTDIR=./instroot-rhel8 && tar -C instroot-rhel8 -cf instroot-rhel8.tar .
2222

23-
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
23+
FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
2424
ARG TAGS=""
2525
COPY install /manifests
2626
RUN if [ "${TAGS}" = "fcos" ]; then \

0 commit comments

Comments
 (0)