From ba97858085e04636273fd3769bc28dab69aab1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Sun, 29 Sep 2024 10:41:48 +0200
Subject: [PATCH] [UPD] start v18 branch

---
 .gitlab-ci.yml                     |  14 ++--
 17.0.Dockerfile => 18.0.Dockerfile | 113 ++++++++++++++---------------
 README.md                          |  11 ++-
 odoo.conf                          |   3 +
 ssh_known_git_hosts                |   2 +
 5 files changed, 76 insertions(+), 67 deletions(-)
 rename 17.0.Dockerfile => 18.0.Dockerfile (56%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 272f452..f2b7828 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@
 # Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
 # Note that environment variables can be set in several places
 # See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
-image: docker:26
+image: docker:27
 include:
   - template: Security/Container-Scanning.gitlab-ci.yml
   - template: Security/Secret-Detection.gitlab-ci.yml
@@ -14,15 +14,15 @@ container_scanning:
     CS_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH"
     CS_DOCKERFILE_PATH: "$CI_COMMIT_BRANCH.Dockerfile"
     GIT_STRATEGY: fetch
-docker-build-17.0:
-  image: docker:26
+docker-build-18.0:
+  image: docker:27
   stage: build
   services:
-    - docker:26-dind
+    - docker:27-dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build --progress=plain --pull -f 17.0.Dockerfile -t "$CI_REGISTRY_IMAGE:17.0" .
-    - docker push "$CI_REGISTRY_IMAGE:17.0"
+    - docker build --progress=plain --pull -f 18.0.Dockerfile -t "$CI_REGISTRY_IMAGE:18.0" .
+    - docker push "$CI_REGISTRY_IMAGE:18.0"
   only:
-    - '17.0'
+    - '18.0'
diff --git a/17.0.Dockerfile b/18.0.Dockerfile
similarity index 56%
rename from 17.0.Dockerfile
rename to 18.0.Dockerfile
index 203df8a..cc04c61 100644
--- a/17.0.Dockerfile
+++ b/18.0.Dockerfile
@@ -9,7 +9,7 @@ RUN set -x; \
     libpq-dev \
     libsasl2-dev \
   && pip install wheel \
-  && pip wheel --wheel-dir=/svc/wheels --requirement https://raw.githubusercontent.com/oca/OCB/17.0/requirements.txt \
+  && pip wheel --wheel-dir=/svc/wheels --requirement https://raw.githubusercontent.com/oca/OCB/18.0/requirements.txt \
   # astor required by base_view_inheritance_extension
   # openupgradelib required for OCA module migration from one version to another
   # phonenumbers required by phone_validation
@@ -41,7 +41,7 @@ RUN set -x; \
   && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /svc /svc
-RUN pip3 install --no-index --find-links=/svc/wheels --requirement https://raw.githubusercontent.com/oca/OCB/17.0/requirements.txt \
+RUN pip3 install --no-index --find-links=/svc/wheels --requirement https://raw.githubusercontent.com/oca/OCB/18.0/requirements.txt \
   && pip3 install --no-index --upgrade --find-links=/svc/wheels \
     'astor' \
     'openupgradelib' \
@@ -58,7 +58,7 @@ COPY ./ssh_known_git_hosts /root/.ssh/known_hosts
 ARG SAVE_COMMITS_FILENAME='ocb'
 RUN set -x; \
   repo='https://github.com/OCA/OCB' \
-  branch='17.0' \
+  branch='18.0' \
   && useradd --create-home --home-dir /opt/odoo --no-log-init odoo \
   && /bin/bash -c "mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}" \
   && mkdir /opt/odoo_commits \
@@ -78,60 +78,59 @@ COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin
 
 # Install Odoo OCA default dependencies - Commented modules do not exist yet
 ARG SAVE_COMMITS_FILENAME='default_addons'
-RUN set -x; \
-  get_addons 'https://github.com/OCA/account-financial-tools' '17.0' 'additional_addons' \
-    account_lock_date_update \
-    account_move_name_sequence \
-    account_usability \
-  # https://github.com/OCA/account-invoicing/pull/1713
-  # && get_addons 'https://github.com/OCA/account-invoicing' '17.0' 'additional_addons' \
-  #   sale_timesheet_invoice_description \
-  && get_addons 'https://github.com/OCA/account-reconcile' '17.0' 'additional_addons' \
-    account_statement_base \
-    account_reconcile_model_oca \
-    account_reconcile_oca \
-  && get_addons 'https://github.com/OCA/bank-statement-import' '17.0' 'additional_addons' \
-    account_statement_import_base \
-    account_statement_import_file \
-    account_statement_import_file_reconcile_oca \
-    # account_statement_import_ofx \
-  && get_addons 'https://github.com/OCA/crm' '17.0' 'additional_addons' \
-    crm_stage_probability \
-  && get_addons 'https://github.com/OCA/l10n-france' '17.0' 'additional_addons' \
-    l10n_fr_siret \
-    # l10n_fr_siret_lookup \
-  && get_addons 'https://github.com/OCA/partner-contact' '17.0' 'additional_addons' \
-    # partner_disable_gravatar \
-    partner_firstname \
-  && get_addons 'https://github.com/OCA/project' '17.0' 'additional_addons' \
-    project_task_default_stage \
-    # project_template \
-  # && get_addons 'https://github.com/OCA/server-auth' '17.0' 'additional_addons' \
-  #   password_security \
-  && get_addons 'https://github.com/OCA/server-brand' '17.0' 'additional_addons' \
-    disable_odoo_online \
-    # portal_odoo_debranding \
-    remove_odoo_enterprise \
-  && get_addons 'https://github.com/OCA/server-tools' '17.0' 'additional_addons' \
-    base_view_inheritance_extension \
-    module_change_auto_install \
-  && get_addons 'https://github.com/OCA/server-ux' '17.0' 'additional_addons' \
-    server_action_mass_edit \
-  && get_addons 'https://github.com/OCA/social' '17.0' 'additional_addons' \
-    mail_debrand \
-    mail_tracking \
-  && get_addons 'https://github.com/OCA/web' '17.0' 'additional_addons' \
-    web_environment_ribbon \
-    web_refresher \
-    web_responsive \
-    web_no_bubble \
-    web_theme_classic \
-  && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \
+#RUN set -x; \
+#  get_addons 'https://github.com/OCA/account-financial-tools' '17.0' 'additional_addons' \
+#    account_lock_date_update \
+#    account_move_name_sequence \
+#    account_usability \
+#  && get_addons 'https://github.com/OCA/account-invoicing' '17.0' 'additional_addons' \
+#    sale_timesheet_invoice_description \
+#  && get_addons 'https://github.com/OCA/account-reconcile' '17.0' 'additional_addons' \
+#    account_statement_base \
+#    account_reconcile_model_oca \
+#    account_reconcile_oca \
+#  && get_addons 'https://github.com/OCA/bank-statement-import' '17.0' 'additional_addons' \
+#    account_statement_import_base \
+#    account_statement_import_file \
+#    account_statement_import_file_reconcile_oca \
+#    account_statement_import_ofx \
+#  && get_addons 'https://github.com/OCA/crm' '17.0' 'additional_addons' \
+#    crm_stage_probability \
+#  && get_addons 'https://github.com/OCA/l10n-france' '17.0' 'additional_addons' \
+#    l10n_fr_siret \
+#    l10n_fr_siret_lookup \
+#  && get_addons 'https://github.com/OCA/partner-contact' '17.0' 'additional_addons' \
+#    partner_disable_gravatar \
+#    partner_firstname \
+#  && get_addons 'https://github.com/OCA/project' '17.0' 'additional_addons' \
+#    project_task_default_stage \
+#    project_template \
+#  && get_addons 'https://github.com/OCA/server-auth' '17.0' 'additional_addons' \
+#    password_security \
+#  && get_addons 'https://github.com/OCA/server-brand' '17.0' 'additional_addons' \
+#    disable_odoo_online \
+#    portal_odoo_debranding \
+#    remove_odoo_enterprise \
+#  && get_addons 'https://github.com/OCA/server-tools' '17.0' 'additional_addons' \
+#    base_view_inheritance_extension \
+#    module_change_auto_install \
+#  && get_addons 'https://github.com/OCA/server-ux' '17.0' 'additional_addons' \
+#    server_action_mass_edit \
+#  && get_addons 'https://github.com/OCA/social' '17.0' 'additional_addons' \
+#    mail_debrand \
+#    mail_tracking \
+#  && get_addons 'https://github.com/OCA/web' '17.0' 'additional_addons' \
+#    web_environment_ribbon \
+#    web_refresher \
+#    web_responsive \
+#    web_no_bubble \
+#    web_theme_classic \
+#  && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \
   # Install Le Filament default addons.
-  # && get_addons 'https://sources.le-filament.com/lefilament/remove_login_links.git' '17.0' 'private_addons/remove_login_links' \
-  # && get_addons 'https://sources.le-filament.com/lefilament/lefilament_release_agent.git' '17.0' 'private_addons/lefilament_release_agent' \
-  && echo "info: default addon commits:" \
-  && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME
+#  && get_addons 'https://sources.le-filament.com/lefilament/remove_login_links.git' '17.0' 'private_addons/remove_login_links' \
+#  && get_addons 'https://sources.le-filament.com/lefilament/lefilament_release_agent.git' '17.0' 'private_addons/lefilament_release_agent' \
+#  && echo "info: default addon commits:" \
+#  && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME
 
 # Copy entrypoint script and Odoo configuration file
 COPY ./entrypoint.sh /
@@ -152,7 +151,7 @@ ENTRYPOINT ["/entrypoint.sh"]
 CMD ["odoo"]
 
 # Metadata
-LABEL org.label-schema.schema-version="17.0" \
+LABEL org.label-schema.schema-version="18.0" \
       org.label-schema.vendor=LeFilament \
       org.label-schema.license=Apache-2.0 \
       org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"
diff --git a/README.md b/README.md
index 5017650..049a837 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Basic Odoo docker including OCB 10.0/12.0/14.0/15.0/16.0 and some of OCA repos/addons
+# Basic Odoo docker including OCB 10.0/12.0/14.0/15.0/16.0/17.0/18.0 and some of OCA repos/addons
 
 These docker images are now maintained on [Le Filament GitLab server](https://sources.le-filament.com/lefilament/odoo_docker)
 
@@ -6,7 +6,7 @@ These docker images are now maintained on [Le Filament GitLab server](https://so
 
 This Docker is inspired from the ones from [Odoo](https://github.com/odoo/docker), [Tecnativa](https://github.com/Tecnativa/doodba) and [Elico Corporation](https://github.com/Elico-Corp/odoo-docker).
 
-It creates a functional Odoo Docker of limited size (< 400 MB), including Odoo 10.0 or 12.0 or 14.0 or 15.0 or 16.0 from [OCA/OCB](https://github.com/oca/ocb), and also a few addons from [OCA](https://github.com/oca) + addons from [Le Filament](https://sources.le-filament.com/lefilament).
+It creates a functional Odoo Docker of limited size (< 400 MB), including Odoo 10.0 or 12.0 or 14.0 or 15.0 or 16.0 or 17.0 or 18.0 from [OCA/OCB](https://github.com/oca/ocb), and also a few addons from [OCA](https://github.com/oca) + addons from [Le Filament](https://sources.le-filament.com/lefilament).
 
 In order to reduce as much as possible the size of the Docker, only French translations are kept and .git directories are removed.
 For people needing other languages than English or French, a 12.0_ml image is also provided (only for v12.0 though).
@@ -18,6 +18,8 @@ The following Python versions are used :
  - Odoo 14.0 : Python 3.9
  - Odoo 15.0 : Python 3.10
  - Odoo 16.0 : Python 3.11
+ - Odoo 17.0 : Python 3.12
+ - Odoo 18.0 : Python 3.12
 
 Also a specific Python 3.6 version for Odoo v12.0 is generated with tag 12.0_py3.6
 
@@ -78,7 +80,7 @@ The following OCA addons are included by default in this image (in v16.0):
 # Usage
 
 
-This docker is built every nigth and pushed on [DockerHub](https://hub.docker.com/r/lefilament/odoo) and can be pulled by executing the following command:
+This docker is built every night (for most recent versions only) and pushed on [DockerHub](https://hub.docker.com/r/lefilament/odoo) and can be pulled by executing the following command:
 ```
 docker pull lefilament/odoo:10.0
 docker pull lefilament/odoo:12.0
@@ -87,6 +89,8 @@ docker pull lefilament/odoo:12.0_py3.6
 docker pull lefilament/odoo:14.0
 docker pull lefilament/odoo:15.0
 docker pull lefilament/odoo:16.0
+docker pull lefilament/odoo:17.0
+docker pull lefilament/odoo:18.0
 ```
 
 Note that not Odoo maintained versions (v10.0, v12.0) are not updated nightly like the other ones since there are almost no change on corresponding codes. These versions might be updated in case security fixes are added to corresponding code.
@@ -134,6 +138,7 @@ volumes:
 ## Contributors
 
 * Remi Cazenave <remi-filament>
+* Théo Chapy <theo-le-filament>
 
 
 ## Maintainer
diff --git a/odoo.conf b/odoo.conf
index c4be806..1b29902 100644
--- a/odoo.conf
+++ b/odoo.conf
@@ -43,6 +43,7 @@ db_name = odoo
 ; db_template = template0
 ; db_host = db
 ; db_maxconn = 64
+; db_maxconn_gevent = 64
 ; db_sslmode = prefer
 ; pg_path =
 
@@ -58,6 +59,8 @@ unaccent = True
 ;; Multiprocessing options
 ; limit_memory_hard = 2684354560
 ; limit_memory_soft = 2147483648
+; limit_memory_hard_gevent = 2684354560
+; limit_memory_soft_gevent = 2147483648
 ; limit_request = 65536
 ; limit_time_cpu = 60
 ; limit_time_real = 120
diff --git a/ssh_known_git_hosts b/ssh_known_git_hosts
index c548a0b..ace3342 100644
--- a/ssh_known_git_hosts
+++ b/ssh_known_git_hosts
@@ -1,4 +1,6 @@
 bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
+bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE=
+bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO
 
 github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
 github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-- 
GitLab