diff --git a/Dockerfile.rhel b/Dockerfile.rhel new file mode 100644 index 000000000..c9bb074cb --- /dev/null +++ b/Dockerfile.rhel @@ -0,0 +1,17 @@ +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder +WORKDIR /go/src/github.com/openshift/cluster-machine-approver +COPY . . +RUN make build + +FROM registry.svc.ci.openshift.org/ocp/4.6:base +COPY --from=builder /go/src/github.com/openshift/cluster-machine-approver/machine-approver /usr/bin/ +COPY manifests /manifests +ENTRYPOINT ["/usr/bin/machine-approver"] +LABEL io.k8s.display-name="OpenShift cluster-machine-approver" \ + io.k8s.description="This is an OpenShift component for approving new machines" \ + com.redhat.component="cluster-machine-approver" \ + maintainer="OpenShift Auth Team " \ + name="openshift/ose-cluster-machine-approver" \ + version="v4.0.0" \ + io.openshift.tags="openshift" \ + io.openshift.release.operator=true diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 deleted file mode 100644 index c9bb074cb..000000000 --- a/Dockerfile.rhel7 +++ /dev/null @@ -1,17 +0,0 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder -WORKDIR /go/src/github.com/openshift/cluster-machine-approver -COPY . . -RUN make build - -FROM registry.svc.ci.openshift.org/ocp/4.6:base -COPY --from=builder /go/src/github.com/openshift/cluster-machine-approver/machine-approver /usr/bin/ -COPY manifests /manifests -ENTRYPOINT ["/usr/bin/machine-approver"] -LABEL io.k8s.display-name="OpenShift cluster-machine-approver" \ - io.k8s.description="This is an OpenShift component for approving new machines" \ - com.redhat.component="cluster-machine-approver" \ - maintainer="OpenShift Auth Team " \ - name="openshift/ose-cluster-machine-approver" \ - version="v4.0.0" \ - io.openshift.tags="openshift" \ - io.openshift.release.operator=true diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 new file mode 120000 index 000000000..46cd531f6 --- /dev/null +++ b/Dockerfile.rhel7 @@ -0,0 +1 @@ +Dockerfile.rhel \ No newline at end of file