[REF] docker-compose: Allow easier module debug

This might break actual standalone deployments, as a named volume was added. But it also makes it easier to develop with hosted modules, as both approaches now support hosted modules

Author: gustavovalverde

.devcontainer/.vscode/launch.json

@@ -7,7 +7,7 @@
             "request": "launch",
             "redirectOutput": false,
             "cwd": "${workspaceRoot}",
-            "program": "/usr/local/bin/odoo",
+            "program": "/opt/odoo/odoo-bin",
             "args": [
                 "--config=/etc/odoo/odoo.conf",
                 "--log-level=info",
@@ -20,7 +20,7 @@
             "redirectOutput": false,
             "cwd": "${workspaceRoot}",
             "justMyCode": false,
-            "program": "/usr/local/bin/odoo",
+            "program": "/opt/odoo/odoo-bin",
             "args": [
                 "--config=/etc/odoo/odoo.conf",
                 "--dev=qweb,werkzeug,xml",
@@ -33,7 +33,7 @@
             "request": "launch",
             "redirectOutput": false,
             "cwd": "${workspaceRoot}",
-            "program": "/usr/local/bin/odoo",
+            "program": "/opt/odoo/odoo-bin",
             "args": [
                 "--config=/etc/odoo/odoo.conf",
                 "--log-level=info",
@@ -47,7 +47,7 @@
             "request": "launch",
             "redirectOutput": false,
             "cwd": "${workspaceRoot}",
-            "program": "/usr/local/bin/odoo",
+            "program": "/opt/odoo/odoo-bin",
             "args": [
                 "--config=/etc/odoo/odoo.conf",
                 "--log-level=info",

Dockerfile

@@ -144,7 +144,7 @@ ENV PIP_AUTO_INSTALL=${PIP_AUTO_INSTALL:-"0"}
 # Run tests for all the modules in the custom addons
 ENV RUN_TESTS=${RUN_TESTS:-"0"}
 
-ENV DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \
+ENV DEBUGPY_ARGS="--listen 0.0.0.0:5678 --wait-for-client" \
     DEBUGPY_ENABLE=0
 
     # Create app user

README.md

@@ -1,6 +1,6 @@
-# Dockerized Odoo for Odoo 11.0
+# Dockerized Odoo
 
-This is a flexible and **streamlined** version of most Odoo docker projects that you'll find. And one that allows you to deploy with two different methods using the same Dockerfile:
+This is a flexible and **streamlined** version of most dockerized Odoo projects that you'll find. And one that allows you to deploy with two different methods using the same Dockerfile:
 
 * **Standalone**: As most people use their implementation. With Odoo's source code inside the container. **This is the default**
 * **Hosted**: A more practical deployment for **development**, as the HOST (where docker is installed) has the source code, and each container uses this single source.

dev-hosted.yml

@@ -12,11 +12,6 @@ services:
   # ------------------------
 
   odoo:
-    # Uncomment the next lines to build the image. This is mainly useful
-    # when you need to add additional requirements on the building phase
-    #build:
-    #  context: .
-    #  dockerfile: Dockerfile
     volumes:
       # Host paths (odoo modules, src code & conf)
       - ./custom:${ODOO_EXTRA_ADDONS}:delegated
@@ -28,5 +23,6 @@ services:
       - WDB_SOCKET_SERVER=wdb
       - WDB_NO_BROWSER_AUTO_OPEN=True
       - WDB_WEB_PORT=1984
-    command: ["${ODOO_CMD}", "--dev", "wdb,reload,qweb,werkzeug,xml"]
+      - DEBUGPY_ENABLE=1
     depends_on: ["db", "wdb"]
+    command: ["${ODOO_CMD}", "--dev", "wdb,reload,qweb,werkzeug,xml"]

dev-standalone.yml

@@ -1,32 +1,26 @@
 version: "3.7"
 
-volumes:
-  odoo-modules:
-
 services:
   wdb:
     image: kozea/wdb:3.3.0
     ports: ["1984:1984"]
+    restart: unless-stopped
     networks:
       - odoonet
     depends_on: ["db"]
 
   # ------------------------
 
   odoo:
-    # Uncomment the next lines to build the image. This is mainly useful
-    # when you need to add additional requirements on the building phase
-    #build:
-    #  context: .
-    #  dockerfile: Dockerfile
     volumes:
-      # Named volumes (third party modules)
-      - odoo-modules:${ODOO_EXTRA_ADDONS}
+      # Host paths (odoo modules, src code & conf)
+      - ./custom:${ODOO_EXTRA_ADDONS}:delegated
     environment:
       - LOG_LEVEL=debug
       - WITHOUT_DEMO=False
       - WDB_SOCKET_SERVER=wdb
       - WDB_NO_BROWSER_AUTO_OPEN=True
       - WDB_WEB_PORT=1984
+      - DEBUGPY_ENABLE=1
     depends_on: ["db", "wdb"]
     command: ["odoo", "--dev", "wdb,reload,qweb,werkzeug,xml"]

docker-compose.yml

@@ -9,6 +9,7 @@ networks:
 volumes:
   odoo-data:
   odoo-testlogs:
+  odoo-modules:
   psql:
 
 services:
@@ -26,7 +27,7 @@ services:
       # Named volumes
       - odoo-data:${ODOO_DATA_DIR}
       - odoo-testlogs:${ODOO_LOGS_DIR}
-
+      - odoo-modules:${ODOO_EXTRA_ADDONS}
     depends_on:
       - db
 

hosted.yml

@@ -9,4 +9,4 @@ services:
     #  dockerfile: Dockerfile
     volumes:
       # Host paths (odoo src code & .vscode conf)
-      - ./src/odoo:/${ODOO_BASEPATH}
+      - ./src/odoo:/${ODOO_BASEPATH}:delegated