From 232aeab9fa2cbdd3aaf2fc65892d411930c349f2 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Wed, 25 Jun 2025 16:31:39 +0200 Subject: [PATCH] fix(odoo): update python version selection logic --- images/odoo/Dockerfile | 2 +- task | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/images/odoo/Dockerfile b/images/odoo/Dockerfile index 500fa339..9da2872c 100644 --- a/images/odoo/Dockerfile +++ b/images/odoo/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build environment -ARG PYTHON_VERSION=3.12 +ARG PYTHON_VERSION FROM python:${PYTHON_VERSION}-slim-bookworm AS builder # Retrieve the Odoo version diff --git a/task b/task index b5faec0e..7895add7 100755 --- a/task +++ b/task @@ -597,17 +597,21 @@ function build() { ODOO_DATE=$(echo "$ODOO_REVISION" | cut -d'.' -f3-) source "revisions/$ODOO_REVISION" - if [[ "15.0,16.0" =~ "$ODOO_VERSION" ]]; then - PYTHON_VERSION="3.9" - else - PYTHON_VERSION="3.12" - fi - - if [[ "17.0" =~ "$ODOO_VERSION" ]]; then - PYTHON_VERSION="3.11" - else - PYTHON_VERSION="3.12" - fi + case "$ODOO_VERSION" in + "15.0") + PYTHON_VERSION="3.9" + ;; + "16.0") + PYTHON_VERSION="3.9" + ;; + "17.0") + PYTHON_VERSION="3.11" + ;; + *) + PYTHON_VERSION="3.12" + ;; + esac + echo "Python version is: $PYTHON_VERSION" if [ "$CONTAINER_ENGINE" == "podman" ]; then echo "Remove container image with tag ${CONTAINER_REGISTRY}${CONTAINER_TAG}"