Merge pull request #419 from laradock/yarn

Revert #418 and fix install yarn package management.
This commit is contained in:
Mahmoud Zalt 2016-11-10 09:32:19 -05:00 committed by GitHub
commit 5e9ae56a7f
2 changed files with 1 additions and 3 deletions

View File

@ -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 #######################################

View File

@ -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 \