From 8611c2dc051053f1bec044b0152f690fe18f7acd Mon Sep 17 00:00:00 2001 From: Davide Bortolami Date: Sun, 8 Mar 2020 23:37:30 +0000 Subject: [PATCH] reduce layers, cleanup comments --- build/bench/Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile index 4261adc8..e5800ba9 100644 --- a/build/bench/Dockerfile +++ b/build/bench/Dockerfile @@ -72,17 +72,15 @@ RUN bench --version # Print version and verify bashrc is properly sourced so that everything works in the interactive shell RUN bash -c "bench --version" - -# Install nvm with node -# !!! UPDATE PERIODICALLY WITH LATEST VERSIONS !!! +# !!! UPDATE NODEJS PERIODICALLY WITH LATEST VERSIONS !!! # https://nodejs.org/en/about/releases/ # https://nodejs.org/download/release/latest-v10.x/ # https://nodejs.org/download/release/latest-v12.x/ # https://nodejs.org/download/release/latest-v13.x/ - ENV NODE_VERSION=12.16.1 ENV NODE_VERSION_FRAPPEV11=10.19.0 +# Install nvm with node RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh RUN chmod +x install.sh RUN ./install.sh @@ -99,13 +97,13 @@ ENV PATH="/home/frappe/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}" RUN npm install -g yarn # Print version and verify bashrc is properly sourced so that everything works in the Dockerfile -RUN node --version -RUN npm --version -RUN yarn --version +RUN node --version \ + && npm --version \ + && yarn --version # Print version and verify bashrc is properly sourced so that everything works in the interactive shell -RUN bash -c "node --version" -RUN bash -c "npm --version" -RUN bash -c "yarn --version" +RUN bash -c "node --version" \ + && bash -c "npm --version" \ + && bash -c "yarn --version" WORKDIR /home/frappe/frappe-bench