Skip to content

Commit

Permalink
Merge pull request #319 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.15-ose-cluster-openshift-controller-manager-operator

OCPBUGS-24086: Updating ose-cluster-openshift-controller-manager-operator-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Mar 5, 2024
2 parents 1ba446b + 2e3529b commit f189a00
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.20-openshift-4.15
tag: rhel-9-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/github.com/openshift/cluster-openshift-controller-manager-operator
COPY . .
RUN GO_COMPLIANCE_INFO=0 make

FROM registry.ci.openshift.org/ocp/4.15:base
FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
COPY --from=builder /go/src/github.com/openshift/cluster-openshift-controller-manager-operator/cluster-openshift-controller-manager-operator /usr/bin/
COPY manifests /manifests
COPY vendor/github.com/openshift/api/config/v1/*_openshift-controller-manager-operator_*.yaml /manifests
Expand Down

0 comments on commit f189a00

Please sign in to comment.