From a4eb42347c9154a0cec6175d9b403e9ba2bec7d2 Mon Sep 17 00:00:00 2001 From: Sam Batschelet Date: Wed, 20 Feb 2019 13:49:09 -0500 Subject: [PATCH] Dockerfile: resolve issue where binary was not properly copied from build. Signed-off-by: Sam Batschelet --- Dockerfile.openshift | 3 ++- Dockerfile.rhel | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index d30cb6ac082..9dc11e3dd7c 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -13,7 +13,8 @@ FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base ENTRYPOINT ["/usr/bin/etcd"] -COPY --from=builder /go/src/go.etcd.io/etcd/bin/{etcd,etcdctl} /usr/bin/ +COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/ +COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/ LABEL io.k8s.display-name="etcd server" \ io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \ diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 2318b99439a..ae4b1468f8d 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -13,7 +13,8 @@ FROM openshift/origin-base ENTRYPOINT ["/usr/bin/etcd"] -COPY --from=builder /go/src/go.etcd.io/etcd/bin/{etcd,etcdctl} /usr/bin/ +COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/ +COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/ LABEL io.k8s.display-name="etcd server" \ io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \