Merge pull request #419 from laradock/yarn
Revert #418 and fix install yarn package management.
This commit is contained in:
commit
5e9ae56a7f
@ -36,8 +36,6 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "2222:22"
|
- "2222:22"
|
||||||
tty: true
|
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 #######################################
|
### PHP-FPM Container #######################################
|
||||||
|
|
||||||
|
@ -191,7 +191,7 @@ ARG INSTALL_YARN=false
|
|||||||
ENV INSTALL_YARN ${INSTALL_YARN}
|
ENV INSTALL_YARN ${INSTALL_YARN}
|
||||||
|
|
||||||
RUN if [ ${INSTALL_YARN} = true ]; then \
|
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 && \
|
curl -o- -L https://yarnpkg.com/install.sh | bash && \
|
||||||
echo "" >> ~/.bashrc && \
|
echo "" >> ~/.bashrc && \
|
||||||
echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \
|
echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \
|
||||||
|
Loading…
Reference in New Issue
Block a user