[IMP] Dockerfile and addons list

17.0: install additional dependencies not present by default.
18.0: update the addons list file format.

17.0/Dockerfile

@@ -75,6 +75,10 @@ RUN pip3 install rlPyCairo
 RUN curl https://raw.githubusercontent.com/odoo/odoo/${ODOO_VERSION}/requirements.txt > /tmp/requirements.txt && \
     pip3 install -r /tmp/requirements.txt
 
+# Install additional Odoo python dependencies
+RUN curl https://raw.githubusercontent.com/cetmix/cetmix-odoo-docker/${ODOO_VERSION}/extra-requirements.txt > /tmp/extra-requirements.txt && \
+    pip3 install -r /tmp/extra-requirements.txt
+
 # Add "odoo" user. We use same guid uid as in the official Odoo image
 RUN groupadd --gid ${DOCKER_ODOO_GID} odoo && useradd odoo -u ${DOCKER_ODOO_UID} -g ${DOCKER_ODOO_GID} -m -s /bin/bash
 

17.0/Dockerfile.odoo

@@ -52,7 +52,7 @@ RUN if [ -z "${TARGETARCH}" ]; then \
     && DEBIAN_FRONTEND=noninteractive apt-get install -qq -f --no-install-recommends \
     && rm /tmp/wkhtml.deb
 
-    # Install latest version of the PG client
+# Install latest version of the PG client
 RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/pgclient.list \
     && apt-get update -qq \
@@ -78,6 +78,10 @@ RUN pip3 install rlPyCairo
 RUN curl https://raw.githubusercontent.com/odoo/odoo/${ODOO_VERSION}/requirements.txt > /tmp/requirements.txt && \
     pip3 install -r /tmp/requirements.txt
 
+# Install additional Odoo python dependencies
+RUN curl https://raw.githubusercontent.com/cetmix/cetmix-odoo-docker/${ODOO_VERSION}/extra-requirements.txt > /tmp/extra-requirements.txt && \
+    pip3 install -r /tmp/extra-requirements.txt
+
 # Add "odoo" user. We use same guid uid as in the official Odoo image
 RUN groupadd --gid ${DOCKER_ODOO_GID} odoo && useradd odoo -u ${DOCKER_ODOO_UID} -g ${DOCKER_ODOO_GID} -m -s /bin/bash
 

17.0/extra-requirements.txt

@@ -0,0 +1,4 @@
+# Needed for export data from xlsx
+# Present in Odoo 18.0 requirement.txt
+openpyxl==3.0.9 ; python_version < '3.12'
+openpyxl==3.1.2 ; python_version >= '3.12'

18.0/addons.yml

@@ -1,12 +1,13 @@
-# This file is designed to be used qit Git Aggregator
-# Check https://github.com/acsone/git-aggregator for more details and documentation 
+# This is a basic template. Disconnect your file from it to add your own repos
+# Check https://github.com/acsone/git-aggregator for possible configuration options
 
-./oca-reporting-engine:
+# This is how you can use GitHub token for private GitHub repos
+./odoo-enterprise:
     remotes:
-        oca: https://github.com/oca/reporting-engine.git
+        remote_1: https://${GITHUB_TOKEN}:x-oauth-basic@github.com/odoo/enterprise.git
     merges:
         -
-            remote: oca
+            remote: remote_1
             ref: "18.0"
             depth: 1
-    target: oca
+    target: remote_1