From 0785c318251e5cddbc6fd31ea3fd6e0a2eb1d35f Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Mon, 4 Nov 2024 10:55:46 +0100 Subject: [PATCH 1/4] [REF] Improve settings. Introduce _FIRST_ODOO_VERSION_SUPPORTED and _LAST_ODOO_VERSION_SUPPORTED --- .../configuration_version_dependant.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/odoo_openupgrade_wizard/configuration_version_dependant.py b/odoo_openupgrade_wizard/configuration_version_dependant.py index e3e6f47..c6791ea 100644 --- a/odoo_openupgrade_wizard/configuration_version_dependant.py +++ b/odoo_openupgrade_wizard/configuration_version_dependant.py @@ -2,7 +2,15 @@ from pathlib import Path from loguru import logger -_ALL_ODOO_VERSIONS = [8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0] +FIRST_ODOO_VERSION_SUPPORTED = 8 +LAST_ODOO_VERSION_SUPPORTED = 16 + +_ALL_ODOO_VERSIONS = [ + float(x) + for x in range( + FIRST_ODOO_VERSION_SUPPORTED, LAST_ODOO_VERSION_SUPPORTED + 1 + ) +] def get_version_options(mode: str) -> list: From 1f079e088ef0ba46e5a60a53780c89270cd8d6d1 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Mon, 4 Nov 2024 10:56:02 +0100 Subject: [PATCH 2/4] [ADD] support 17.0 --- newsfragments/add-17.0 | 1 + .../configuration_version_dependant.py | 2 +- .../templates/odoo/17.0/Dockerfile | 50 +++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 newsfragments/add-17.0 create mode 100644 odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile diff --git a/newsfragments/add-17.0 b/newsfragments/add-17.0 new file mode 100644 index 0000000..f222b5a --- /dev/null +++ b/newsfragments/add-17.0 @@ -0,0 +1 @@ +Support 17.0 serie. diff --git a/odoo_openupgrade_wizard/configuration_version_dependant.py b/odoo_openupgrade_wizard/configuration_version_dependant.py index c6791ea..67f28ae 100644 --- a/odoo_openupgrade_wizard/configuration_version_dependant.py +++ b/odoo_openupgrade_wizard/configuration_version_dependant.py @@ -3,7 +3,7 @@ from pathlib import Path from loguru import logger FIRST_ODOO_VERSION_SUPPORTED = 8 -LAST_ODOO_VERSION_SUPPORTED = 16 +LAST_ODOO_VERSION_SUPPORTED = 17 _ALL_ODOO_VERSIONS = [ float(x) diff --git a/odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile new file mode 100644 index 0000000..e76f92f --- /dev/null +++ b/odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile @@ -0,0 +1,50 @@ +# : Copy of https://github.com/odoo/odoo/blob/17.0/setup/package.dfsrc +FROM debian:bookworm + +RUN apt-get update && \ + apt-get install -y locales && \ + rm -rf /var/lib/apt/lists/* + +# Reconfigure locales such that postgresql uses UTF-8 encoding +RUN dpkg-reconfigure locales && \ + locale-gen C.UTF-8 && \ + /usr/sbin/update-locale LANG=C.UTF-8 +ENV LC_ALL C.UTF-8 + +RUN apt-get update -qq && \ + apt-get upgrade -qq -y && \ + apt-get install \ + postgresql \ + postgresql-server-dev-all \ + postgresql-client \ + adduser \ + libldap2-dev \ + libsasl2-dev \ + python3-pip \ + python3-venv \ + python3-wheel \ + build-essential \ + python3 -y && \ + rm -rf /var/lib/apt/lists/* + +# Install Debian packages +COPY extra_debian_requirements.txt /extra_debian_requirements.txt +RUN apt-get update -qq \ + && apt-get install -y git \ + && xargs apt-get install -y --no-install-recommends Install Python librairies +COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt +COPY extra_python_requirements.txt /extra_python_requirements.txt +RUN pip3 install --upgrade pip --break-system-packages \ + && python3 -m pip install --no-cache-dir setuptools-scm --break-system-packages \ + && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt --break-system-packages \ + && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt --break-system-packages + +# Get local user id and set it to the odoo user +ARG LOCAL_USER_ID + +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo + +USER odoo From c0b8be6b202177cdd7f0d9b534bb9284258b2d86 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Mon, 4 Nov 2024 11:24:29 +0100 Subject: [PATCH 3/4] [ADD] support 18.0 --- newsfragments/add-18.0 | 1 + .../configuration_version_dependant.py | 2 +- .../templates/odoo/18.0/Dockerfile | 50 +++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 newsfragments/add-18.0 create mode 100644 odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile diff --git a/newsfragments/add-18.0 b/newsfragments/add-18.0 new file mode 100644 index 0000000..cbec939 --- /dev/null +++ b/newsfragments/add-18.0 @@ -0,0 +1 @@ +Support 18.0 serie. diff --git a/odoo_openupgrade_wizard/configuration_version_dependant.py b/odoo_openupgrade_wizard/configuration_version_dependant.py index 67f28ae..fc3f90b 100644 --- a/odoo_openupgrade_wizard/configuration_version_dependant.py +++ b/odoo_openupgrade_wizard/configuration_version_dependant.py @@ -3,7 +3,7 @@ from pathlib import Path from loguru import logger FIRST_ODOO_VERSION_SUPPORTED = 8 -LAST_ODOO_VERSION_SUPPORTED = 17 +LAST_ODOO_VERSION_SUPPORTED = 18 _ALL_ODOO_VERSIONS = [ float(x) diff --git a/odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile new file mode 100644 index 0000000..d6ec8bc --- /dev/null +++ b/odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile @@ -0,0 +1,50 @@ +# : Copy of https://github.com/odoo/odoo/blob/18.0/setup/package.dfsrc +FROM debian:bookworm + +RUN apt-get update && \ + apt-get install -y locales && \ + rm -rf /var/lib/apt/lists/* + +# Reconfigure locales such that postgresql uses UTF-8 encoding +RUN dpkg-reconfigure locales && \ + locale-gen C.UTF-8 && \ + /usr/sbin/update-locale LANG=C.UTF-8 +ENV LC_ALL C.UTF-8 + +RUN apt-get update -qq && \ + apt-get upgrade -qq -y && \ + apt-get install \ + postgresql \ + postgresql-server-dev-all \ + postgresql-client \ + adduser \ + libldap2-dev \ + libsasl2-dev \ + python3-pip \ + python3-venv \ + python3-wheel \ + build-essential \ + python3 -y && \ + rm -rf /var/lib/apt/lists/* + +# Install Debian packages +COPY extra_debian_requirements.txt /extra_debian_requirements.txt +RUN apt-get update -qq \ + && apt-get install -y git \ + && xargs apt-get install -y --no-install-recommends Install Python librairies +COPY ./src/odoo/requirements.txt /odoo_python_requirements.txt +COPY extra_python_requirements.txt /extra_python_requirements.txt +RUN pip3 install --upgrade pip --break-system-packages \ + && python3 -m pip install --no-cache-dir setuptools-scm --break-system-packages \ + && python3 -m pip install --no-cache-dir -r /odoo_python_requirements.txt --break-system-packages \ + && python3 -m pip install --no-cache-dir -r /extra_python_requirements.txt --break-system-packages + +# Get local user id and set it to the odoo user +ARG LOCAL_USER_ID + +RUN useradd --uid $LOCAL_USER_ID --non-unique odoo + +USER odoo From 2d4a7d6917fb5578fa9aa762e9721a1e881be2ad Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Mon, 4 Nov 2024 11:32:53 +0100 Subject: [PATCH 4/4] [FIX] remove docker build warning, regarding ENV values. WARN: LegacyKeyValueFormat: 'ENV key=value' should be used instead of legacy 'ENV key value' format --- odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile | 2 +- odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile index 73c8130..c4404a2 100644 --- a/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/11.0/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ diff --git a/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile index f9e2c80..8d92257 100644 --- a/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/12.0/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ diff --git a/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile index d2935c3..b98352a 100644 --- a/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/13.0/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ diff --git a/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile index 59751ee..f3a2ac0 100644 --- a/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/14.0/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ diff --git a/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile index f5d3860..546f052 100644 --- a/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/15.0/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ diff --git a/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile index 6779c90..6d1ce7d 100644 --- a/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/16.0/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ diff --git a/odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile index e76f92f..db0fe1b 100644 --- a/odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/17.0/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ diff --git a/odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile b/odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile index d6ec8bc..7f0db7a 100644 --- a/odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile +++ b/odoo_openupgrade_wizard/templates/odoo/18.0/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ RUN dpkg-reconfigure locales && \ locale-gen C.UTF-8 && \ /usr/sbin/update-locale LANG=C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LC_ALL=C.UTF-8 RUN apt-get update -qq && \ apt-get upgrade -qq -y && \