From 5d98e78dba06d3fb46edf3d853aa9516e57f3b9a Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Thu, 10 Nov 2016 10:23:49 +0800 Subject: [PATCH] Revert #418 and fix install yarn package management. Signed-off-by: Bo-Yi Wu --- docker-compose.yml | 2 -- workspace/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f65f15b9..b7eed65b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,8 +36,6 @@ services: ports: - "2222:22" tty: true - environment: - - PATH=$PATH:/home/laradock/.yarn/bin:/var/www/vendor/bin:/home/laradock/.nvm/versions/node/v7.1.0/bin ### PHP-FPM Container ####################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 31d98b35..bf97a8fa 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -191,7 +191,7 @@ ARG INSTALL_YARN=false ENV INSTALL_YARN ${INSTALL_YARN} RUN if [ ${INSTALL_YARN} = true ]; then \ - export PATH=$PATH:/home/laradock/.nvm/versions/node/v7.1.0/bin && \ + [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \ curl -o- -L https://yarnpkg.com/install.sh | bash && \ echo "" >> ~/.bashrc && \ echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \