diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 59b3360c..7591eec4 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -99,18 +99,18 @@ USER frappe WORKDIR /home/frappe # Install Python via pyenv -ENV PYTHON_VERSION_V14=3.10.13 +ENV PYTHON_VERSION_PREV=3.12.12 ENV PYTHON_VERSION=3.14.2 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_V14 \ + && pyenv install $PYTHON_VERSION_PREV \ && pyenv install $PYTHON_VERSION \ - && PYENV_VERSION=$PYTHON_VERSION_V14 pip install --no-cache-dir virtualenv \ + && PYENV_VERSION=$PYTHON_VERSION_PREV pip install --no-cache-dir virtualenv \ && PYENV_VERSION=$PYTHON_VERSION pip install --no-cache-dir virtualenv \ - && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v14 \ + && pyenv global $PYTHON_VERSION $PYTHON_VERSION_PREV \ && 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,15 +126,15 @@ 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=16.20.2 -ENV NODE_VERSION=24.12.0 +ENV NODE_VERSION_PREV=22.22.0 +ENV NODE_VERSION=24.13.0 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_14} \ - && nvm use v${NODE_VERSION_14} \ + && nvm install ${NODE_VERSION_PREV} \ + && nvm use v${NODE_VERSION_PREV} \ && npm install -g yarn \ && nvm install ${NODE_VERSION} \ && nvm use v${NODE_VERSION} \ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index 21523892..97b9906e 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.11.6 +ARG PYTHON_VERSION=3.14.2 ARG DEBIAN_BASE=bookworm FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base @@ -7,7 +7,7 @@ COPY resources/core/nginx/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm -ARG NODE_VERSION=20.19.2 +ARG NODE_VERSION=24.13.0 ENV NVM_DIR=/home/frappe/.nvm ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -115,7 +115,7 @@ RUN if [ -n "${APPS_JSON_BASE64}" ]; then \ USER frappe -ARG FRAPPE_BRANCH=version-15 +ARG FRAPPE_BRANCH=version-16 ARG FRAPPE_PATH=https://github.com/frappe/frappe RUN export APP_INSTALL_ARGS="" && \ if [ -n "${APPS_JSON_BASE64}" ]; then \ diff --git a/images/layered/Containerfile b/images/layered/Containerfile index 12a089ee..142c487a 100644 --- a/images/layered/Containerfile +++ b/images/layered/Containerfile @@ -1,8 +1,8 @@ -ARG FRAPPE_BRANCH=version-15 +ARG FRAPPE_BRANCH=version-16 FROM frappe/build:${FRAPPE_BRANCH} AS builder -ARG FRAPPE_BRANCH=version-15 +ARG FRAPPE_BRANCH=version-16 ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG APPS_JSON_BASE64 diff --git a/images/production/Containerfile b/images/production/Containerfile index d44f3878..abebba86 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -1,10 +1,10 @@ -ARG PYTHON_VERSION=3.11.6 +ARG PYTHON_VERSION=3.14.2 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=20.19.2 +ARG NODE_VERSION=24.13.0 ENV NVM_DIR=/home/frappe/.nvm ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -103,10 +103,10 @@ USER frappe FROM build AS builder -ARG FRAPPE_BRANCH=version-15 +ARG FRAPPE_BRANCH=version-16 ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG ERPNEXT_REPO=https://github.com/frappe/erpnext -ARG ERPNEXT_BRANCH=version-15 +ARG ERPNEXT_BRANCH=version-16 RUN bench init \ --frappe-branch=${FRAPPE_BRANCH} \ --frappe-path=${FRAPPE_PATH} \