From 97ee7c940c68c1aa27ff85ec4be9ea95a0833d2c Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 20 Oct 2023 17:25:58 +0530
Subject: [PATCH] chore: upgrade python and nodejs

---
 .github/workflows/build_develop.yml |  4 ++--
 .github/workflows/build_stable.yml  |  4 ++--
 docker-bake.hcl                     |  4 ++--
 images/bench/Dockerfile             | 21 +++++++--------------
 images/custom/Containerfile         |  4 ++--
 images/production/Containerfile     |  4 ++--
 6 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index e4d303d7..e37c5858 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -26,8 +26,8 @@ jobs:
       repo: erpnext
       version: develop
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-      python_version: 3.11.5
-      node_version: 18.18.0
+      python_version: 3.11.6
+      node_version: 18.18.2
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
index c91f74d7..a09f70b8 100644
--- a/.github/workflows/build_stable.yml
+++ b/.github/workflows/build_stable.yml
@@ -48,8 +48,8 @@ jobs:
       repo: erpnext
       version: "15"
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-      python_version: 3.11.5
-      node_version: 18.18.0
+      python_version: 3.11.6
+      node_version: 18.18.2
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/docker-bake.hcl b/docker-bake.hcl
index f5217422..f2a9fc70 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,10 +6,10 @@ variable "REGISTRY_USER" {
 }
 
 variable PYTHON_VERSION {
-    default = "3.11.5"
+    default = "3.11.6"
 }
 variable NODE_VERSION {
-    default = "18.18.0"
+    default = "18.18.2"
 }
 
 variable "FRAPPE_VERSION" {
diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile
index 1c78dbcd..291e4256 100644
--- a/images/bench/Dockerfile
+++ b/images/bench/Dockerfile
@@ -96,20 +96,17 @@ WORKDIR /home/frappe
 
 # Install Python via pyenv
 ENV PYTHON_VERSION_V14=3.10.13
-ENV PYTHON_VERSION_DEVELOP=3.11.5
-ENV PYTHON_VERSION=3.11.5
+ENV PYTHON_VERSION=3.11.6
 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_V14 \
     && 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_V14 pip install --no-cache-dir virtualenv \
     && PYENV_VERSION=$PYTHON_VERSION pip install --no-cache-dir virtualenv \
-    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v13 \
+    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v14 \
     && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \
     && echo 'eval "$(pyenv init --path)"' >>~/.profile \
     && echo 'eval "$(pyenv init -)"' >>~/.bashrc
@@ -126,18 +123,14 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \
 
 # Install Node via nvm
 ENV NODE_VERSION_14=16.20.2
-ENV NODE_VERSION_DEVELOP=18.18.0
-ENV NODE_VERSION=18.18.0
+ENV NODE_VERSION=18.18.2
 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.5/install.sh | bash \
     && . ${NVM_DIR}/nvm.sh \
-    && 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} \
+    && nvm install ${NODE_VERSION_14} \
+    && nvm use v${NODE_VERSION_14} \
     && npm install -g yarn \
     && nvm install ${NODE_VERSION} \
     && nvm use v${NODE_VERSION} \
diff --git a/images/custom/Containerfile b/images/custom/Containerfile
index 9d19f266..9aeecaa8 100644
--- a/images/custom/Containerfile
+++ b/images/custom/Containerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.11.5
+ARG PYTHON_VERSION=3.11.6
 ARG DEBIAN_BASE=bookworm
 FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
 
@@ -7,7 +7,7 @@ COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
 
 ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
 ARG WKHTMLTOPDF_DISTRO=bookworm
-ARG NODE_VERSION=18.18.0
+ARG NODE_VERSION=18.18.2
 ENV NVM_DIR=/home/frappe/.nvm
 ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
 
diff --git a/images/production/Containerfile b/images/production/Containerfile
index c79e7fc3..ac5d77af 100644
--- a/images/production/Containerfile
+++ b/images/production/Containerfile
@@ -1,10 +1,10 @@
-ARG PYTHON_VERSION=3.11.5
+ARG PYTHON_VERSION=3.11.6
 ARG DEBIAN_BASE=bookworm
 FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
 
 ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
 ARG WKHTMLTOPDF_DISTRO=bookworm
-ARG NODE_VERSION=18.18.0
+ARG NODE_VERSION=18.18.2
 ENV NVM_DIR=/home/frappe/.nvm
 ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}