Skip to content

Commit

Permalink
Merge pull request #119 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.6-ose-baremetal-operator

Updating ose-baremetal-operator builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jan 28, 2021
2 parents 9c39676 + 5445008 commit b4b10a0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,10 +1,10 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
WORKDIR /go/src/github.com/metal3-io/baremetal-operator
COPY . .
RUN make build
RUN make tools

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/metal3-io/baremetal-operator/build/_output/bin/baremetal-operator /
COPY --from=builder /go/src/github.com/metal3-io/baremetal-operator/build/_output/bin/get-hardware-details /
RUN if ! rpm -q genisoimage; then yum install -y genisoimage && yum clean all && rm -rf /var/cache/yum/*; fi

0 comments on commit b4b10a0

Please sign in to comment.