2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-23 18:48:58 +00:00

fix: use same python and nginx image

This commit is contained in:
Revant Nandgaonkar 2020-08-06 22:38:52 +05:30
parent a7cd40a2b7
commit 7c293d7f9e
2 changed files with 12 additions and 3 deletions

View File

@ -1,5 +1,14 @@
ARG NODE_IMAGE_TAG=12-prod FROM bitnami/python:3.7-prod
FROM bitnami/node:${NODE_IMAGE_TAG}
ENV NVM_DIR=/root/.nvm
ENV NODE_VERSION=12.18.3
ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
RUN install_packages wget \
&& wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh \
&& chmod +x install.sh \
&& ./install.sh \
&& . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION} \
&& nvm use v${NODE_VERSION} && npm install -g yarn
WORKDIR /home/frappe/frappe-bench WORKDIR /home/frappe/frappe-bench
RUN mkdir -p /home/frappe/frappe-bench/sites \ RUN mkdir -p /home/frappe/frappe-bench/sites \

View File

@ -5,7 +5,7 @@ RUN useradd -ms /bin/bash frappe
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV NVM_DIR=/home/frappe/.nvm ENV NVM_DIR=/home/frappe/.nvm
ENV NODE_VERSION=14.7.0 ENV NODE_VERSION=12.18.3
ENV PATH="/home/frappe/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}" ENV PATH="/home/frappe/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
# Install dependencies # Install dependencies