Merge pull request #444 from wking/rhel-version-agnostic-dockerfile

openshift-merge-robot · web-flow · commit 05f3d334cec0 · 2020-08-27T02:27:21.000-04:00
Bug 1872080: Dockerfile.rhel: Use a RHEL-version-agnostic filename
diff --git a/Dockerfile.rhel 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/cluster-version-operator
+COPY . .
+RUN hack/build-go.sh; \
+    mkdir -p /tmp/build; \
+    cp _output/linux/$(go env GOARCH)/cluster-version-operator /tmp/build/cluster-version-operator
+
+FROM registry.svc.ci.openshift.org/ocp/4.6:base
+COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
+COPY install /manifests
+COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/
+COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml /manifests/
+COPY bootstrap /bootstrap
+ENTRYPOINT ["/usr/bin/cluster-version-operator"]
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -0,0 +1 @@
+Dockerfile.rhel
