From 44045f85e61005d8b3b517c5d2dccf770c28b134 Mon Sep 17 00:00:00 2001 From: Alexandre Thomas Date: Wed, 9 Nov 2016 16:14:49 +0100 Subject: [PATCH 1/2] Fix a bug that prevents yarn from installing --- docker-compose.yml | 2 ++ workspace/Dockerfile | 1 + 2 files changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 1c3b58c..66e2f7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,8 @@ services: ports: - "2222:22" tty: true + environment: + - PATH=$PATH:$HOME/.yarn/bin:/var/www/vendor/bin:$HOME/.nvm/versions/node/v7.1.0/bin ### PHP-FPM Container ####################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index d13486f..31d98b3 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -191,6 +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 && \ curl -o- -L https://yarnpkg.com/install.sh | bash && \ echo "" >> ~/.bashrc && \ echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \ From 5594c53e03800f8922dddce1cddc03ccdca1343a Mon Sep 17 00:00:00 2001 From: Alexandre Thomas Date: Wed, 9 Nov 2016 17:54:35 +0100 Subject: [PATCH 2/2] Fix bug in PATH --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 66e2f7e..46b91a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,7 +37,7 @@ services: - "2222:22" tty: true environment: - - PATH=$PATH:$HOME/.yarn/bin:/var/www/vendor/bin:$HOME/.nvm/versions/node/v7.1.0/bin + - PATH=$PATH:/home/laradock/.yarn/bin:/var/www/vendor/bin:/home/laradock/.nvm/versions/node/v7.1.0/bin ### PHP-FPM Container #######################################