diff --git a/docker-bake.hcl b/docker-bake.hcl index cd47b824..bf8eeca7 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -73,8 +73,8 @@ target "default-args" { BENCH_REPO = "${BENCH_REPO}" FRAPPE_VERSION = "${FRAPPE_VERSION}" ERPNEXT_VERSION = "${ERPNEXT_VERSION}" - # If `ERPNEXT_VERSION` variable contains "v12" use Python 3.7. Else — 3.9. - PYTHON_VERSION = can(regex("v12", "${ERPNEXT_VERSION}")) ? "3.7" : "3.9" + # If `ERPNEXT_VERSION` variable contains "v12" use Python 3.7. If "v13" — 3.9. Else 3.10. + PYTHON_VERSION = can(regex("v12", "${ERPNEXT_VERSION}")) ? "3.7" : can(regex("v13", "${ERPNEXT_VERSION}")) ? "3.9" : "3.10" } } diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index a963425e..55a7f67d 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -79,15 +79,17 @@ WORKDIR /home/frappe # Python 3.7 sits here for ERPNext version-12 # TODO: Remove Python 3.7 when version-12 will not be supported ENV PYTHON_VERSION_V12=3.7.12 -ENV PYTHON_VERSION=3.9.9 +ENV PYTHON_VERSION_V13=3.9.9 +ENV PYTHON_VERSION=3.10.5 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_V12 \ + && pyenv install $PYTHON_VERSION_v13 \ && pyenv install $PYTHON_VERSION \ - && pyenv global $PYTHON_VERSION $PYTHON_VERSION_V12 \ + && pyenv global $PYTHON_VERSION $PYTHON_VERSION_V12 $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 \ && echo 'eval "$(pyenv init --path)"' >>~/.profile \ && echo 'eval "$(pyenv init -)"' >>~/.bashrc