update dind image

openshift · Nov 21, 2017 · d6b88e2 · d6b88e2
1 parent a29bc3a
commit d6b88e2
Show file tree

Hide file tree

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