From debec8aaf2bd5e6feef4bcc3137ee89535e987b8 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Wed, 9 Apr 2025 12:47:36 +0530
Subject: [PATCH] ci: fix develop builds

---
 .github/workflows/build_develop.yml | 4 ++--
 CONTRIBUTING.md                     | 3 ++-
 docker-bake.hcl                     | 4 ++--
 images/custom/Containerfile         | 4 ++--
 images/production/Containerfile     | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index e37c5858..be25b75c 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.6
-      node_version: 18.18.2
+      python_version: 3.13.3
+      node_version: 20.19.0
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3cc671ee..0b3e0890 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -74,7 +74,8 @@ Each Frappe/ERPNext release triggers new stable images builds as well as bump to
 In case of new release of Debian. e.g. bullseye to bookworm. Change following files:
 
 - `images/erpnext/Containerfile` and `images/custom/Containerfile`: Change the files to use new debian release, make sure new python version tag that is available on new debian release image. e.g. 3.9.9 (bullseye) to 3.9.17 (bookworm) or 3.10.5 (bullseye) to 3.10.12 (bookworm). Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
-- `images/bench/Dockerfile`: Change the files to use new debian release. Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
+- `images/bench/Dockerfile`: Change the file to use new debian release. Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
+- `docker-bake.hcl`: Change the default Python and NodeJS versions in this file.
 
 Change following files on release of ERPNext
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 3304ce40..6f25083f 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,10 +6,10 @@ variable "REGISTRY_USER" {
 }
 
 variable PYTHON_VERSION {
-    default = "3.11.6"
+    default = "3.13.3"
 }
 variable NODE_VERSION {
-    default = "18.18.2"
+    default = "20.19.0"
 }
 
 variable "FRAPPE_VERSION" {
diff --git a/images/custom/Containerfile b/images/custom/Containerfile
index ff02845b..915842e6 100644
--- a/images/custom/Containerfile
+++ b/images/custom/Containerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.11.6
+ARG PYTHON_VERSION=3.13.3
 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.2
+ARG NODE_VERSION=20.19.0
 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 7f36e0ed..516921c0 100644
--- a/images/production/Containerfile
+++ b/images/production/Containerfile
@@ -1,10 +1,10 @@
-ARG PYTHON_VERSION=3.11.6
+ARG PYTHON_VERSION=3.13.3
 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.2
+ARG NODE_VERSION=20.19.0
 ENV NVM_DIR=/home/frappe/.nvm
 ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}