modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug avec traitement des variables de docker-machine -u

This commit is contained in:
Jephté Clain 2019-10-03 19:12:38 +04:00
parent f8750935a8
commit aae3703558
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dk
View File

@ -1275,13 +1275,16 @@ function auto_composer() {
fi
if [ -n "$COMPOSER_MACHINE" -a "$DOCKER_MACHINE_NAME" != "$COMPOSER_MACHINE" ]; then
local DOCKER_TLS_VERIFY DOCKER_HOST DOCKER_CERT_PATH DOCKER_MACHINE_NAME env
local -x DOCKER_TLS_VERIFY= DOCKER_HOST= DOCKER_CERT_PATH= DOCKER_MACHINE_NAME=
if [ "$COMPOSER_MACHINE" != -u ]; then
local env
setx env=docker-machine env "$COMPOSER_MACHINE" 2>/dev/null || {
eerror "$COMPOSER_MACHINE: une erreur s'est produite lors de la sélection du noeud avec docker-machine"
return 1
}
eval "$env"
fi
fi
local user group projdir actualcmd args
setx user=id -un; setx user=getent passwd "$user"