From 779f8be4fe11133064c76a7cc256fb7afcf27dfb Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Wed, 28 Jun 2023 15:53:35 +0530
Subject: [PATCH] fix: add python 3.11 and nodejs 18 (#1163)

used for frappe develop branch
---
 images/bench/Dockerfile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile
index 92470bc7..e12d5e53 100644
--- a/images/bench/Dockerfile
+++ b/images/bench/Dockerfile
@@ -95,16 +95,19 @@ USER frappe
 WORKDIR /home/frappe
 
 # Install Python via pyenv
-ENV PYTHON_VERSION_V13=3.9.9
-ENV PYTHON_VERSION=3.10.5
+ENV PYTHON_VERSION_V13=3.9.17
+ENV PYTHON_VERSION_DEVELOP=3.11.4
+ENV PYTHON_VERSION=3.10.12
 ENV PYENV_ROOT /home/frappe/.pyenv
 ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 
 # From https://github.com/pyenv/pyenv#basic-github-checkout
 RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \
     && pyenv install $PYTHON_VERSION_V13 \
+    && pyenv install $PYTHON_VERSION_DEVELOP \
     && pyenv install $PYTHON_VERSION \
     && PYENV_VERSION=$PYTHON_VERSION_V13 pip install --no-cache-dir virtualenv \
+    && PYENV_VERSION=$PYTHON_VERSION_DEVELOP pip install --no-cache-dir virtualenv \
     && PYENV_VERSION=$PYTHON_VERSION pip install --no-cache-dir virtualenv \
     && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v13 \
     && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \
@@ -122,15 +125,19 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \
     && echo "export BENCH_DEVELOPER=1" >>/home/frappe/.bashrc
 
 # Install Node via nvm
-ENV NODE_VERSION_14=14.19.3
-ENV NODE_VERSION=16.18.0
+ENV NODE_VERSION_13=14.21.3
+ENV NODE_VERSION_DEVELOP=14.21.3
+ENV NODE_VERSION=16.20.1
 ENV NVM_DIR /home/frappe/.nvm
 ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
 
 RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
     && . ${NVM_DIR}/nvm.sh \
-    && nvm install ${NODE_VERSION_14} \
-    && nvm use v${NODE_VERSION_14} \
+    && nvm install ${NODE_VERSION_13} \
+    && nvm use v${NODE_VERSION_13} \
+    && npm install -g yarn \
+    && nvm install ${NODE_VERSION_DEVELOP} \
+    && nvm use v${NODE_VERSION_DEVELOP} \
     && npm install -g yarn \
     && nvm install ${NODE_VERSION} \
     && nvm use v${NODE_VERSION} \