563f5806 by Adam Heath

Tweak order and reduce amount of volume mounts.

1 parent 6ff46cb3
...@@ -6,14 +6,20 @@ declare -a docker_args=(--rm -i) ...@@ -6,14 +6,20 @@ declare -a docker_args=(--rm -i)
6 6
7 [[ -t 0 ]] && docker_args+=(-t) 7 [[ -t 0 ]] && docker_args+=(-t)
8 8
9 docker_args+=(--network host)
10 docker_args+=(-v /:/srv/host-root) 9 docker_args+=(-v /:/srv/host-root)
11 docker_args+=(-w /srv/host-root/$PWD) 10 docker_args+=(-w /srv/host-root/$PWD)
12 [[ $SSH_AUTH_SOCK ]] && docker_args+=(-v "$SSH_AUTH_SOCK:$SSH_AUTH_SOCK" -e "SSH_AUTH_SOCK=$SSH_AUTH_SOCK") 11 [[ $SSH_AUTH_SOCK ]] && docker_args+=(-e "SSH_AUTH_SOCK=/srv/host-root/$SSH_AUTH_SOCK")
12 network=
13 if [[ $KUBECONFIG ]]; then 13 if [[ $KUBECONFIG ]]; then
14 docker_args+=(-v "$KUBECONFIG:/srv/host-root/$KUBECONFIG" -e "KUBECONFIG=/srv/host-root/$KUBECONFIG") 14 network=host
15 elif [[ $HOME/.kube/config ]]; then 15 docker_args+=(-e "KUBECONFIG=/srv/host-root/$KUBECONFIG")
16 docker_args+=(-e "KUBECONFIG=/srv/host-root/$HOME/.kube/config") 16 elif [[ -e $HOME/.kube/config ]]; then
17 network=host
18 docker_args+=(-v "$HOME/.kube/config:/home/tool/.kube/config")
19 fi
20
21 if [[ $network ]]; then
22 docker_args+=(--network host)
17 fi 23 fi
18 24
19 docker_args+=(-e MAP_UID="$(id -u)" -e MAP_GROUPS="$(id -G)") 25 docker_args+=(-e MAP_UID="$(id -u)" -e MAP_GROUPS="$(id -G)")
......