Skip to content

Commit

Permalink
Merge pull request #182 from jupierce/art-consistency-openshift-4.7-o…
Browse files Browse the repository at this point in the history 
…se-cluster-openshift-controller-manager-operator

Updating ose-cluster-openshift-controller-manager-operator builder & base images to be consistent with ART
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Oct 12, 2020
2 parents 78ee57b + 3b94e1f commit 315f4ab
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
WORKDIR /go/src/github.com/openshift/cluster-openshift-controller-manager-operator
COPY . .
RUN make

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.svc.ci.openshift.org/ocp/4.7:base
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/operator/v1/0000_50_cluster-openshift-controller-manager-operator_02_config.crd.yaml /manifests
Expand Down

0 comments on commit 315f4ab

Please sign in to comment.