Merge pull request #5 from openshift/fx_etcd_docker

Dockerfile: resolve issue where binary was not properly copied
openshift · Feb 20, 2019 · a0e62b4 · a0e62b4
2 parents 86413f5 + a4eb423
commit a0e62b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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." \