Skip to content

Commit

Permalink
Merge pull request #796 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.8-ose-machine-api-operator

Updating ose-machine-api-operator builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jul 9, 2021
2 parents 57fb4dd + 32dac43 commit 1155220
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel
@@ -1,9 +1,9 @@
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.16-openshift-4.8 AS builder
WORKDIR /go/src/github.com/openshift/machine-api-operator
COPY . .
RUN NO_DOCKER=1 make build

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.8:base
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/install manifests
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator .
COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/nodelink-controller .
Expand Down

0 comments on commit 1155220

Please sign in to comment.