From d878740ec0c8ebd85858e39ed33923480b13861d Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 6 Feb 2019 22:52:47 -0800 Subject: [PATCH] Dockerfile.*: Also copy etcdctl to the target image We're already building it, and the installer wants etcdctl to monitor the etcd cluster health during bootstrapping [1]. [1]: https://github.com/openshift/installer/blob/v0.12.0/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template#L177-L198 --- Dockerfile.openshift | 1 + Dockerfile.rhel | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 1327c0d095cc..459734c391df 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -14,6 +14,7 @@ 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 /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 distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \ diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 991967cbf2a9..2b8b2160810d 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -14,6 +14,7 @@ FROM openshift/origin-base ENTRYPOINT ["/usr/bin/etcd"] 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 distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \