Skip to content

Commit

Permalink
Merge pull request #390 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.16-ose-cluster-config-operator

OCPBUGS-24871: Updating ose-cluster-config-operator-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Apr 1, 2024
2 parents 84ae6b5 + 0453233 commit 777e50b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.21-openshift-4.16
tag: rhel-9-release-golang-1.21-openshift-4.16
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
WORKDIR /go/src/github.com/openshift/cluster-config-operator
COPY . .
ENV GO_PACKAGE github.com/openshift/cluster-config-operator
RUN make build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.16:base
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
RUN mkdir -p /usr/share/bootkube/manifests/manifests
RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/
Expand Down

0 comments on commit 777e50b

Please sign in to comment.