From 31ed5daa68a79b2e6774ee1b846bde807f345b30 Mon Sep 17 00:00:00 2001 From: gp <370905+gparent@users.noreply.github.com> Date: Thu, 29 May 2025 08:03:28 -0400 Subject: [PATCH] chore: Update EOL NodeJS to 20.19.2 (#1638) --- .github/workflows/build_stable.yml | 2 +- docs/custom-apps.md | 4 ++-- images/bench/Dockerfile | 2 +- images/custom/Containerfile | 2 +- images/production/Containerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index f24960ba..275c22ac 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -49,7 +49,7 @@ jobs: version: "15" push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} python_version: 3.11.6 - node_version: 18.18.2 + node_version: 20.19.2 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/docs/custom-apps.md b/docs/custom-apps.md index 9d5acaeb..544bdee4 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -93,7 +93,7 @@ docker build \ --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \ --build-arg=FRAPPE_BRANCH=version-15 \ --build-arg=PYTHON_VERSION=3.11.9 \ - --build-arg=NODE_VERSION=18.20.2 \ + --build-arg=NODE_VERSION=20.19.2 \ --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ --tag=ghcr.io/user/repo/custom:1.0.0 \ --file=images/custom/Containerfile . @@ -102,7 +102,7 @@ docker build \ Custom build args, - `PYTHON_VERSION`, use the specified python version for base image. Default is `3.11.6`. -- `NODE_VERSION`, use the specified nodejs version, Default `18.18.2`. +- `NODE_VERSION`, use the specified nodejs version, Default `20.19.2`. - `DEBIAN_BASE` use the base Debian version, defaults to `bookworm`. - `WKHTMLTOPDF_VERSION`, use the specified qt patched `wkhtmltopdf` version. Default is `0.12.6.1-3`. - `WKHTMLTOPDF_DISTRO`, use the specified distro for debian package. Default is `bookworm`. diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index ba7641cf..1b8a92de 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -125,7 +125,7 @@ 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=18.18.2 +ENV NODE_VERSION=20.19.2 ENV NVM_DIR=/home/frappe/.nvm ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} diff --git a/images/custom/Containerfile b/images/custom/Containerfile index ff02845b..208f13e3 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -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.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 69d7250e..050fec4b 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -4,7 +4,7 @@ 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.2 ENV NVM_DIR=/home/frappe/.nvm ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}