From 7c293d7f9e7406c8ca84726b4ee5e1d9e7698691 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Thu, 6 Aug 2020 22:38:52 +0530
Subject: [PATCH] fix: use same python and nginx image

---
 build/frappe-nginx/Dockerfile  | 13 +++++++++++--
 build/frappe-worker/Dockerfile |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build/frappe-nginx/Dockerfile b/build/frappe-nginx/Dockerfile
index fc17a7b6..e9147aad 100644
--- a/build/frappe-nginx/Dockerfile
+++ b/build/frappe-nginx/Dockerfile
@@ -1,5 +1,14 @@
-ARG NODE_IMAGE_TAG=12-prod
-FROM bitnami/node:${NODE_IMAGE_TAG}
+FROM bitnami/python:3.7-prod
+
+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
 RUN mkdir -p /home/frappe/frappe-bench/sites \
diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile
index 89f1a5bf..68226660 100644
--- a/build/frappe-worker/Dockerfile
+++ b/build/frappe-worker/Dockerfile
@@ -5,7 +5,7 @@ RUN useradd -ms /bin/bash frappe
 ARG GIT_BRANCH=develop
 ENV PYTHONUNBUFFERED 1
 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}"
 
 # Install dependencies