From 1e630967e1bd44de8d295577d508ad81c97b262a Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Thu, 18 Jun 2015 15:46:13 +0200 Subject: [PATCH] [zsh][docker] Use link for ssh auth Otherwise docker may return that the volume cannot be found. Because SSH_AUTH_SOCK may change (e.g. after a reboot) --- .zsh/40_function.zsh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.zsh/40_function.zsh b/.zsh/40_function.zsh index 1a6d85f..51de62b 100755 --- a/.zsh/40_function.zsh +++ b/.zsh/40_function.zsh @@ -160,8 +160,15 @@ function secure_chromium { } sdocker (){ + DOCKER_SSH_AUTH=$HOME/docker_ssh_auth if [ -n "$SSH_AUTH_SOCK" ]; then - SSH_AUTH_ARGS="-v $SSH_AUTH_SOCK:/tmp/ssh_auth -e SSH_AUTH_SOCK=/tmp/ssh_auth" + $(ls -l $HOME/docker_ssh_auth 2> /dev/null | grep $SSH_AUTH_SOCK > /dev/null) + if [ $? ]; + then + unlink $DOCKER_SSH_AUTH > /dev/null + ln -s $SSH_AUTH_SOCK $DOCKER_SSH_AUTH + fi + SSH_AUTH_ARGS="-v $DOCKER_SSH_AUTH:/tmp/ssh_auth -e SSH_AUTH_SOCK=/tmp/ssh_auth" fi AOSP_ARGS=${AOSP_ARGS:--it} img=$(docker ps | grep $1 | awk '{print $1}');