From: Nicolas Boisselier Date: Tue, 29 Nov 2016 11:09:04 +0000 (+0000) Subject: docker.sh X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=c701bc28e9332f83d07f0b13bbde84c852a03c91;p=nb.git docker.sh --- diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh index b911cccc..4af53cb3 100644 --- a/etc/profile.d/docker.sh +++ b/etc/profile.d/docker.sh @@ -80,6 +80,7 @@ _docker_cd() { case "$1" in -back) echo '[ -n "$pwd" ] && cd "$pwd";' + #echo 'echo ">>>$pwd" 1>&2;' ;; *) @@ -113,7 +114,7 @@ _docker_cd() { local pwd=`pwd` ! cd "$cd" echo 'return 1;' && return 1 - echo 'pwd="'$(pwd)'";' + echo 'pwd="'$pwd'";' echo 'docker_dir="'$cd'";' echo 'cd "'$cd'" || return;' diff --git a/src/Docker/Compose/dbq/docker-compose.yaml b/src/Docker/Compose/dbq/docker-compose.yaml index c9af5054..cf4ad2f8 100644 --- a/src/Docker/Compose/dbq/docker-compose.yaml +++ b/src/Docker/Compose/dbq/docker-compose.yaml @@ -3,7 +3,8 @@ app: volumes: #- ./../../../..:/opt/nb - ./../../../../..:/opt - - ./:/var/www/html + - ./../../../../www/dbq:/var/www/html + #- ./:/var/www/html #- ./../../../../lib/php/db:/var/www/html command: "echo . /opt/nb/etc/profile > /etc/profile.d/nb.sh" php: