From 37197072ed3fd59239839b159108e4c6e598d040 Mon Sep 17 00:00:00 2001 From: Michael McCune Date: Mon, 31 Aug 2020 14:53:49 -0400 Subject: [PATCH] Add Dockerfile.rhel to match build configuration in ocp-build-data This change adds a new Dockerfile.rhel file to control builds that target rhel. It is inspired by the automatically generated patches which ensure that build files match what is in the [ocp-build-data repository](https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images) used for producing release artifacts. After this change merges, the configuration files in https://github.com/openshift/release/blob/master/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml and https://github.com/openshift/ocp-build-data/blob/openshift-4.6/images/ose-machine-api-operator.yml should be updated with the new dockerfile path. --- Dockerfile.rhel | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Dockerfile.rhel diff --git a/Dockerfile.rhel b/Dockerfile.rhel new file mode 100644 index 0000000000..c0982de4dd --- /dev/null +++ b/Dockerfile.rhel @@ -0,0 +1,14 @@ +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 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 +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 . +COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-healthcheck . +COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machineset ./machineset-controller +COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/vsphere ./machine-controller-manager + +LABEL io.openshift.release.operator true