From 957bd25d63eb610784933828a450a50224c8e054 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Mon, 14 Nov 2016 22:55:02 +0000 Subject: [PATCH] docker --- etc/profile.d/docker.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh index 5c827889..a2ab585d 100644 --- a/etc/profile.d/docker.sh +++ b/etc/profile.d/docker.sh @@ -59,10 +59,9 @@ docker_run() { [ -z "$(docker images -q "$docker_name")" ] && echo "$FUNCNAME: Can't find image $docker_name. Try docker_build $docker_name" 1>&2 && return local opt - #[ -z "$*" ] && opt=$(perl -ne '/^\s*\#\s*DOCKER_RUN\s*(.*?)$/&&print qq"|$1 "|' "Dockerfile" 2>/dev/null) - [ -z "$*" ] && opt=$(echo "$(perl -ne '/^\s*\#\s*DOCKER_RUN\s*(.*?)$/&&print qq|$1 "|' Dockerfile 2>/dev/null)") + [ -z "$*" ] && opt=$(perl -ne '/^\s*\#\s*DOCKER_RUN\s*(.*?)$/&&print qq|$1 |' Dockerfile 2>/dev/null) echo $FUNCNAME: docker run --rm -it --name $docker_name --hostname $docker_name $opt$@ $docker_name - docker run --rm -it --name $docker_name --hostname $docker_name $opt$@ $docker_name + eval docker run --rm -it --name $docker_name --hostname $docker_name $opt$@ $docker_name [ -n "$pwd" ] && cd "$pwd" } -- 2.47.3