refactored enterprise + third party addons clonning process

.env.example

@@ -150,14 +150,14 @@ MINIO_PROFILES="minio"
 PGADMIN_PROFILES="pgadmin"
 
 # Containers' Tags
-ODOO_TAG=17.0
+ODOO_TAG=15.0
-POSTGRES_TAG=16.4
+POSTGRES_TAG=16.1
 KEYDB_TAG=latest
 MINIO_TAG=latest
 NGINX_TAG=1.25.3
 NGINX_PROXY_TAG=1.4.0
 ACME_COMPANION_TAG=2.2.9
-PGADMIN_TAG=8.11
+PGADMIN_TAG=8.1
 
 # Odoocker paths
 COMMUNITY_ADDONS=${ROOT_PATH}/addons
@@ -202,7 +202,7 @@ DEBUG_INTERFACE=${HTTP_INTERFACE}
 HTTP_PORT=8069
 DEBUG_PORT=8070
 XMLRPCS_PORT=8071
-GEVENT_PORT=8072
+LONGPOLLING_PORT=8072
 HTTP_ENABLE=True
 XMLRPCS=True
 PROXY_MODE=True

.gitignore

@@ -9,6 +9,3 @@ docker-compose.override.yml
 
 # Ignores any __pycache__ folder.
 __pycache__
-
-# Ignores upgrade files
-upgrade/

README.md

@@ -43,7 +43,6 @@ In essence, Odoocker isn't just another tool, it's a philosophy. So, whether you
 1. **Clone and Configure**:
 ```
 git clone git@github.com:odoocker/odoocker.git
-cd odoocker
 cp .env.example .env && cp docker-compose.override.local.yml docker-compose.override.yml
 ```
 2. **Hosts & Domains**: To ensure everything runs smoothly, remember to add the necessary domains to your hosts file.
@@ -156,7 +155,6 @@ docker-compose down
 ```
 cp docker-compose.override.production.yml docker-compose.override.yml
 ```
-- Update .env `SERVICES` (add `acme`) and `ACME_CA_URI` (use production link).
 - Make sure the DNS record of your `DOMAIN` is pointing to your server.
 - Rebuild the containers
 ```

nginx/default.conf

@@ -40,7 +40,7 @@ server {
         }
     }
 
-    location /websocket {
+    location /longpolling {
         proxy_pass http://odoo:8072;
         proxy_redirect off;
         proxy_set_header Upgrade $http_upgrade;

odoo/Dockerfile

@@ -1,7 +1,8 @@
 #------------------------#
 #     Odoo Community     #
 #------------------------#
-FROM odoo:17.0
+ARG ODOO_TAG
+FROM odoo:${ODOO_TAG}
 
 # Switch to root user
 USER root
@@ -48,12 +49,11 @@ RUN apt-get update && apt-get install -y \
     # `zip` and `unzip` for filestore management
     zip \
     unzip \
-    rsync \
     # `git` required packages
     git \
     git-man \
     less \
-    libcbor0.8 \
+    libcbor0 \
     libcurl3-gnutls \
     libedit2 \
     liberror-perl \
@@ -78,8 +78,10 @@ RUN python3 -m pip install -r /tmp/requirements.txt && \
 #    Odoo Enterprise + Third Party Addons    #
 #--------------------------------------------#
 # Create third-party-addons directory and clone them
+RUN mkdir -p ${THIRD_PARTY_ADDONS}
 COPY --chown=odoo:odoo ./odoo/clone-addons.sh /
 COPY --chown=odoo:odoo ./odoo/third-party-addons.txt /
+# RUN /clone-addons.sh && chown odoo:odoo -R ${THIRD_PARTY_ADDONS}
 RUN /clone-addons.sh
 
 #-----------------------#

odoo/clone-addons.sh

@@ -25,7 +25,7 @@ clone_and_copy_modules() {
 
     # Clone and copy logic for enterprise repository
     if [[ $repo_type == "enterprise" ]]; then
-        if [ -n "$GITHUB_USER" ] && [ -n "$GITHUB_ACCESS_TOKEN" ]; then
+        if [[ ! -d "${ENTERPRISE_ADDONS}" ]] && [ -n "$GITHUB_USER" ] && [ -n "$GITHUB_ACCESS_TOKEN" ]; then
             $clone_cmd --depth 1 --branch ${ODOO_TAG} --single-branch --no-tags
         fi
     else
@@ -82,12 +82,8 @@ expand_env_vars() {
     done <<< "$1"
 }
 
-mkdir -p ${THIRD_PARTY_ADDONS}
-
 # Read the configuration file and process each line
 while IFS= read -r line; do
-    mkdir -p ${ENTERPRISE_ADDONS}
-    mkdir -p ${THIRD_PARTY_ADDONS}
     [[ -z "$line" || "$line" == \#* ]] && continue
     clone_and_copy_modules $(expand_env_vars "$line")
 done < "third-party-addons.txt"

odoo/manifest.example.py

@@ -6,7 +6,7 @@
         Goes Here
     ''',
     'version': '1.0.0', # (X.Y.Z.W) X: Odoo Version (not present), Y: Major Upgrade, Z: Bugfix, W: Minor Upgrade
-    'category': 'Uncategorized', # Possible values: [https://github.com/odoo/odoo/blob/17.0/odoo/addons/base/data/ir_module_category_data.xml]
+    'category': 'Uncategorized', # Possible values: [https://github.com/odoo/odoo/blob/16.0/odoo/addons/base/data/ir_module_category_data.xml]
     'license': 'LGPL-3',
     'sequence': 100, # Order in which the module will be displayed
     # Author, Pricing, Licensing, and Support Info

odoo/odoo.conf

@@ -64,8 +64,8 @@ xmlrpcs_interface = ${XMLRPCS_INTERFACE}
 ; --xmlrpcs-port
 xmlrpcs_port = ${XMLRPCS_PORT}
 
-; --gevent-port
+; --longpolling-port
-gevent_port = ${GEVENT_PORT}
+longpolling_port = ${LONGPOLLING_PORT}
 
 ; --no-http | --no-xmlrpc
 http_enable = ${HTTP_ENABLE}

postgres/Dockerfile

@@ -1,4 +1,5 @@
-FROM postgres:16.4
+ARG POSTGRES_TAG
+FROM postgres:${POSTGRES_TAG}
 
 #------------------------#
 #    APT Dependencies    #