reduce layers, cleanup comments

This commit is contained in:
Davide Bortolami
2020-03-08 23:37:30 +00:00
parent 0746693c1f
commit 8611c2dc05

View File

@@ -72,17 +72,15 @@ RUN bench --version
# Print version and verify bashrc is properly sourced so that everything works in the interactive shell # Print version and verify bashrc is properly sourced so that everything works in the interactive shell
RUN bash -c "bench --version" RUN bash -c "bench --version"
# !!! UPDATE NODEJS PERIODICALLY WITH LATEST VERSIONS !!!
# Install nvm with node
# !!! UPDATE PERIODICALLY WITH LATEST VERSIONS !!!
# https://nodejs.org/en/about/releases/ # https://nodejs.org/en/about/releases/
# https://nodejs.org/download/release/latest-v10.x/ # https://nodejs.org/download/release/latest-v10.x/
# https://nodejs.org/download/release/latest-v12.x/ # https://nodejs.org/download/release/latest-v12.x/
# https://nodejs.org/download/release/latest-v13.x/ # https://nodejs.org/download/release/latest-v13.x/
ENV NODE_VERSION=12.16.1 ENV NODE_VERSION=12.16.1
ENV NODE_VERSION_FRAPPEV11=10.19.0 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 wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh
RUN chmod +x install.sh RUN chmod +x install.sh
RUN ./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 RUN npm install -g yarn
# Print version and verify bashrc is properly sourced so that everything works in the Dockerfile # Print version and verify bashrc is properly sourced so that everything works in the Dockerfile
RUN node --version RUN node --version \
RUN npm --version && npm --version \
RUN yarn --version && yarn --version
# Print version and verify bashrc is properly sourced so that everything works in the interactive shell # Print version and verify bashrc is properly sourced so that everything works in the interactive shell
RUN bash -c "node --version" RUN bash -c "node --version" \
RUN bash -c "npm --version" && bash -c "npm --version" \
RUN bash -c "yarn --version" && bash -c "yarn --version"
WORKDIR /home/frappe/frappe-bench WORKDIR /home/frappe/frappe-bench