From d6b88e28f621962132ad8f680efdd35cdfa3c958 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 21 Nov 2017 13:24:33 -0500 Subject: [PATCH] update dind image --- hack/dind-cluster.sh | 1 + images/dind/node/Dockerfile | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hack/dind-cluster.sh b/hack/dind-cluster.sh index c2f1d611bbdd..d9ca0d00392f 100755 --- a/hack/dind-cluster.sh +++ b/hack/dind-cluster.sh @@ -487,6 +487,7 @@ function copy-runtime() { local target=$2 cp "$(os::util::find::built_binary openshift)" "${target}" + cp "$(os::util::find::built_binary oc)" "${target}" cp "$(os::util::find::built_binary host-local)" "${target}" cp "$(os::util::find::built_binary loopback)" "${target}" cp "$(os::util::find::built_binary sdn-cni-plugin)" "${target}/openshift-sdn" diff --git a/images/dind/node/Dockerfile b/images/dind/node/Dockerfile index 120599cc40bc..cdab705ee982 100644 --- a/images/dind/node/Dockerfile +++ b/images/dind/node/Dockerfile @@ -70,11 +70,7 @@ RUN mkdir -p /opt/cni/bin # make reloading easy. Revisit if/when dind becomes useful for more # than dev/test. RUN ln -sf /data/openshift /usr/local/bin/ && \ - ln -sf /data/openshift /usr/local/bin/oc && \ - ln -sf /data/openshift /usr/local/bin/oadm && \ - ln -sf /data/openshift /usr/local/bin/osc && \ - ln -sf /data/openshift /usr/local/bin/osadm && \ - ln -sf /data/openshift /usr/local/bin/kubectl && \ + ln -sf /data/oc /usr/local/bin/ && \ ln -sf /data/openshift /usr/local/bin/openshift-deploy && \ ln -sf /data/openshift /usr/local/bin/openshift-docker-build && \ ln -sf /data/openshift /usr/local/bin/openshift-sti-build && \