Update

Author: roboes

technology/git/git-tools.sh

@@ -79,7 +79,7 @@ if find . -type f -name "*.py" | grep -q "/."; then
 
     # Check if "janitor" is in requirements.txt and replace it with pyjanitor
     if grep -q "janitor" "requirements.txt"; then
-        sed -i '/janitor/c\pyjanitor==0.32.6' requirements.txt
+        sed -i '/janitor/c\pyjanitor==0.32.7' requirements.txt
 		pre-commit run --files "./requirements.txt"
     fi
 

technology/odoo/odoo-installation-docker.md

@@ -1,7 +1,7 @@
 # Odoo Installation (Docker)
 
 > [!NOTE]  
-> Last update: 2025-12-29
+> Last update: 2025-12-30
 
 ```.sh
 # Settings
@@ -37,6 +37,46 @@ sudo usermod -aG docker $system_user
 groups $system_user
 ```
 
+### OCA Submodules
+
+```.sh
+# Initialize git repo in the root odoo folder
+cd $domain_root_path/domains/$subdomain.$domain/odoo
+git config --global --add safe.directory "$domain_root_path/domains/$subdomain.$domain/odoo"
+git init
+
+# Create the addons directory
+mkdir -p "addons"
+cd "addons"
+
+# Add OCA repositories as submodules
+git submodule add --branch $odoo_version https://github.com/OCA/brand.git oca/brand
+git submodule add --branch $odoo_version https://github.com/OCA/product-attribute.git oca/product-attribute
+git submodule add --branch $odoo_version https://github.com/OCA/queue.git oca/queue
+git submodule add --branch $odoo_version https://github.com/OCA/server-tools.git oca/server-tools
+# git submodule add --branch $odoo_version https://github.com/roboes/odoo-woocommerce-sync.git custom/odoo-woocommerce-sync
+
+git commit -m "Add OCA submodules for Odoo $odoo_version"
+```
+
+### Dockerfile & Docker Compose
+
+```.sh
+# Create Dockerfile for custom Odoo image with Python dependencies
+cat <<'EOF' > "$domain_root_path/domains/$subdomain.$domain/odoo/Dockerfile"
+ARG ODOO_VERSION
+FROM odoo:${ODOO_VERSION}
+
+USER root
+
+# Mount addons folder during build to install requirements (requires BuildKit)
+RUN --mount=type=bind,target=/tmp/addons,source=addons \
+    find /tmp/addons -name "requirements.txt" -exec pip3 install --no-cache-dir -r {} \; || true
+
+USER odoo
+EOF
+```
+
 ```.sh
 # Create docker-compose.yml
 cat <<EOF > "$domain_root_path/domains/$subdomain.$domain/odoo/docker-compose.yml"
@@ -45,7 +85,10 @@ name: odoo
 services:
   odoo:
     container_name: "odoo_server_${system_user}"
-    image: odoo:\${ODOO_VERSION}
+    build:
+      context: .
+      args:
+        ODOO_VERSION: \${ODOO_VERSION}
     depends_on:
       db:
         condition: service_healthy
@@ -118,13 +161,18 @@ chmod 600 "$domain_root_path/domains/$subdomain.$domain/odoo/.env"
 ```
 
 ```.sh
-# Create directory
+# Create config directory
 sudo mkdir -p $domain_root_path/domains/$subdomain.$domain/odoo/config
 
-# Create odoo.conf
+# Generate addons_path from submodules (converts ./oca/repo to /mnt/extra-addons/oca/repo)
+cd $domain_root_path/domains/$subdomain.$domain/odoo/addons
+ADDONS_PATH=$(find . -mindepth 2 -maxdepth 2 -type d | grep -E "^\./oca/|^\./custom/" | sed 's|^\./|/mnt/extra-addons/|' | tr '\n' ',' | sed 's/,$//')
+cd $domain_root_path/domains/$subdomain.$domain/odoo
+
+# Create odoo.conf (addons_path includes OCA submodule paths)
 cat <<EOF > "$domain_root_path/domains/$subdomain.$domain/odoo/config/odoo.conf"
 [options]
-addons_path = /usr/lib/python3/dist-packages/odoo/addons,/mnt/extra-addons
+addons_path = /usr/lib/python3/dist-packages/odoo/addons,$ADDONS_PATH
 data_dir = /var/lib/odoo
 admin_passwd = $odoo_master_password
 db_host = $database_host
@@ -147,13 +195,19 @@ EOF
 ```
 
 ```.sh
+# Create data directories
+sudo mkdir -p "$domain_root_path/domains/$subdomain.$domain/odoo/data"
+sudo mkdir -p "$domain_root_path/domains/$subdomain.$domain/odoo/postgres"
+
 # Get Odoo container UID/GID
 odoo_uid=$(docker run --rm odoo:$odoo_version id -u)
 odoo_gid=$(docker run --rm odoo:$odoo_version id -g)
 echo "Odoo UID: $odoo_uid, GID: $odoo_gid"
 
-# Change ownership
+# Change ownership (after git operations are complete)
 sudo chown -R $odoo_uid:$odoo_gid "$domain_root_path/domains/$subdomain.$domain/odoo/data"
+sudo chown -R $odoo_uid:$odoo_gid "$domain_root_path/domains/$subdomain.$domain/odoo/addons"
+sudo chown -R $odoo_uid:$odoo_gid "$domain_root_path/domains/$subdomain.$domain/odoo/config"
 
 # Get PostgreSQL container UID
 postgres_uid=$(docker run --rm postgres:16 id -u)
@@ -164,6 +218,12 @@ echo "Postgres UID: $postgres_uid, GID: $postgres_gid"
 sudo chown -R $postgres_uid:$postgres_gid "$domain_root_path/domains/$subdomain.$domain/odoo/postgres"
 ```
 
+```.sh
+# Build custom Odoo image
+cd $domain_root_path/domains/$subdomain.$domain/odoo
+docker compose build
+```
+
 ```.sh
 # Initialize Odoo database with core modules
 cd $domain_root_path/domains/$subdomain.$domain/odoo
@@ -243,6 +303,7 @@ sudo systemctl reload nginx
 
 # Update Odoo to latest patch
 # docker compose pull
+# docker compose build
 # docker compose up -d
 
 # Access Odoo shell
@@ -252,6 +313,38 @@ sudo systemctl reload nginx
 # docker exec odoo_postgres_${system_user} pg_dump -U $database_username $database_name > backup.sql
 ```
 
+### Update OCA Submodules
+
+```.sh
+# Update all OCA submodules to latest
+cd $domain_root_path/domains/$subdomain.$domain/odoo/addons
+git submodule update --remote --merge
+git add .
+git commit -m "Update OCA submodules"
+
+# Rebuild Docker image (in case requirements.txt changed)
+cd $domain_root_path/domains/$subdomain.$domain/odoo
+docker compose build
+docker compose up -d
+```
+
+### Add New OCA Submodule
+
+```.sh
+# Example: add a new OCA repo
+cd $domain_root_path/domains/$subdomain.$domain/odoo/addons
+git submodule add --branch $odoo_version https://github.com/OCA/account-financial-tools.git oca/account-financial-tools
+git commit -m "Add OCA account-financial-tools"
+
+# Update odoo.conf to include new path
+# Add: /mnt/extra-addons/oca/account-financial-tools
+
+# Rebuild and restart
+cd $domain_root_path/domains/$subdomain.$domain/odoo
+docker compose build
+docker compose up -d
+```
+
 ## Uninstall
 
 ```.sh
@@ -264,5 +357,5 @@ sudo systemctl reload nginx
 # sudo rm -rf $domain_root_path/domains/$subdomain.$domain/odoo
 
 # Confirm docker is not running
-docker ps
+# docker ps
 ```