From ba239c0ebe8bb84e7bd99bc502ec0540612386c9 Mon Sep 17 00:00:00 2001 From: Davide Bortolami Date: Tue, 10 Mar 2020 00:08:50 +0000 Subject: [PATCH] Install yarn in both nodes --- build/bench/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile index 04375ab8..d77f6b15 100644 --- a/build/bench/Dockerfile +++ b/build/bench/Dockerfile @@ -85,13 +85,15 @@ ENV NODE_VERSION_FRAPPEV11=10.19.0 RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh RUN chmod +x install.sh RUN ./install.sh - ENV NVM_DIR=/home/frappe/.nvm -RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION} + +# Install node for Frappe V11, install yarn RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION_FRAPPEV11} -RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION} +RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION_FRAPPEV11} && npm install -g yarn +# Install node for latest frappe, set as default, install node +RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION} +RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION} && npm install -g yarn RUN . "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION} -# Add NVM path for user in Dockerfile, interactive shell is already managed by the NVM install script ENV PATH="/home/frappe/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}" # Install yarn