From fd7fe5203c0a54b4db85492494e7678aa46cc803 Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Fri, 13 Mar 2020 13:37:18 -0400
Subject: [PATCH] Bug 1810710: Update to be usable by buildah

---
 Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 87ce78be9..a0c2d843d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,14 @@ RUN INSTALL_PKGS=" \
     yum clean all && \
     mkdir /tmp/ocp-clo && \
     chmod og+w /tmp/ocp-clo
-COPY --from=builder _output/bin/cluster-logging-operator /usr/bin/
+COPY --from=builder /go/src/github.com/openshift/cluster-logging-operator/_output/bin/cluster-logging-operator /usr/bin/
 COPY scripts/* /usr/bin/scripts/
 RUN mkdir -p /usr/share/logging/
 COPY files/ /usr/share/logging/
-COPY manifests/$CSV /manifests/$CSV
-COPY manifests/cluster-logging.package.yaml /manifests/
+
+COPY --from=builder /go/src/github.com/openshift/cluster-logging-operator/manifests /manifests
+RUN rm /manifests/art.yaml
+
 # this is required because the operator invokes a script as `bash scripts/cert_generation.sh`
 WORKDIR /usr/bin
 ENTRYPOINT ["/usr/bin/cluster-logging-operator"]