fix example

camptocamp · Jan 4, 2024 · ce0c9f8 · ce0c9f8
1 parent 667e832
commit ce0c9f8
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 15 deletions.
diff --git a/example/odoo/Dockerfile → example/Dockerfile b/example/odoo/Dockerfile → example/Dockerfile
@@ -9,8 +9,7 @@ MAINTAINER Camptocamp
 # time of the image on the server (layers are reused)
 RUN mkdir -p /odoo/src/odoo
 COPY ./src /odoo/src/odoo
-COPY ./external-src /odoo/external-src
-COPY ./local-src /odoo/local-src
+COPY ./odoo/addons /odoo/odoo/addons
 COPY ./data /odoo/data
 COPY ./songs /odoo/songs
 COPY ./setup.py /odoo/
@@ -26,11 +25,11 @@ RUN set -x; \
 
 COPY ./requirements.txt /odoo/
 USER odoo
-RUN pip install -e /odoo
-RUN pip install -e /odoo/src/odoo
+RUN cd /odoo && pip install --user -r requirements.txt
+RUN pip install --user -e /odoo/src/odoo
+RUN pip install --user -e /odoo
 
 # Project's specifics packages
-RUN cd /odoo && pip install -r requirements.txt
 
-ENV ADDONS_PATH=/odoo/local-src,/odoo/src/odoo/addons
+ENV ADDONS_PATH=/odoo/odoo/addons,/odoo/src/odoo/addons
 
diff --git a/example/odoo/Dockerfile-onbuild → example/Dockerfile-onbuild b/example/odoo/Dockerfile-onbuild → example/Dockerfile-onbuild
@@ -12,4 +12,4 @@ RUN set -x; \
 COPY ./requirements.txt /odoo/
 RUN cd /odoo && pip install -r requirements.txt
 
-ENV ADDONS_PATH=/odoo/local-src,/odoo/src/addons
+ENV ADDONS_PATH=/odoo/odoo/addons,/odoo/src/addons
diff --git a/example/README.md b/example/README.md
@@ -8,18 +8,18 @@ Follow the steps:
 
 1. Create directories. This is mandatory, they will be copied in the image
 
-        mkdir -p odoo/external-src odoo/local-src odoo/data odoo/songs
+        mkdir -p  odoo/addons data songs
 
 2. Add a submodule for Odoo (official or OCA/OCB)
 
         git submodule init
         git submodule add [email protected]:odoo/odoo.git odoo/src
 
 3. Optionally add submodules for external addons in `odoo/external-src`
- 
+
         git submodule add [email protected]:OCA/server-tools.git odoo/external-src/server-tools
 
-4. Optionally add custom addons in `odoo/local-src`
+4. Optionally add custom addons in `odoo/addons`
 
 6. Create the Dockerfile, the bare minimum being (see also [the example
    file](odoo/Dockerfile) that installs additional dependencies):

diff --git a/example/odoo/data/images/logo.png → example/data/images/logo.png b/example/odoo/data/images/logo.png → example/data/images/logo.png
diff --git a/example/odoo/migration.yml → example/migration.yml b/example/odoo/migration.yml → example/migration.yml
diff --git a/example/odoo/local-src/README.md → example/odoo/addons/README.md b/example/odoo/local-src/README.md → example/odoo/addons/README.md
diff --git a/...ple/odoo/local-src/dummy_test/__init__.py → example/odoo/addons/dummy_test/__init__.py b/...ple/odoo/local-src/dummy_test/__init__.py → example/odoo/addons/dummy_test/__init__.py
diff --git a/.../odoo/local-src/dummy_test/__openerp__.py → ...ple/odoo/addons/dummy_test/__openerp__.py b/.../odoo/local-src/dummy_test/__openerp__.py → ...ple/odoo/addons/dummy_test/__openerp__.py
diff --git a/...oo/local-src/dummy_test/tests/__init__.py → .../odoo/addons/dummy_test/tests/__init__.py b/...oo/local-src/dummy_test/tests/__init__.py → .../odoo/addons/dummy_test/tests/__init__.py
diff --git a/.../local-src/dummy_test/tests/test_dummy.py → ...doo/addons/dummy_test/tests/test_dummy.py b/.../local-src/dummy_test/tests/test_dummy.py → ...doo/addons/dummy_test/tests/test_dummy.py
diff --git a/example/odoo/external-src/README.md b/example/odoo/external-src/README.md
diff --git a/example/odoo/requirements.txt → example/requirements.txt b/example/odoo/requirements.txt → example/requirements.txt
diff --git a/example/odoo/songs/__init__.py → example/songs/__init__.py b/example/odoo/songs/__init__.py → example/songs/__init__.py
diff --git a/example/odoo/songs/install/__init__.py → example/songs/install/__init__.py b/example/odoo/songs/install/__init__.py → example/songs/install/__init__.py
diff --git a/example/odoo/songs/install/base.py → example/songs/install/base.py b/example/odoo/songs/install/base.py → example/songs/install/base.py
diff --git a/example/odoo/songs/install/demo.py → example/songs/install/demo.py b/example/odoo/songs/install/demo.py → example/songs/install/demo.py
diff --git a/example/test-compose.yml b/example/test-compose.yml
@@ -1,18 +1,18 @@
 # Composition used to run automated tests on the images
 # Used by the Makefile at the repository's root
 
-version: '2'
+version: '3.8'
 
 services:
   odoo:
-    build: ./odoo/
+    build: .
     depends_on:
       - db
       - kwkhtmltopdf
     volumes:
       - "data-odoo:/data/odoo"
-      - "./odoo/src/odoo:/odoo/src/odoo/odoo"
-      - "./odoo/src/addons:/odoo/src/odoo/addons"
+      - "./odoo/src/odoo:/odoo/src/odoo"
+      - "./odoo/addons:/odoo/odoo/addons"
     environment:
       - DB_USER=odoo
       - DB_PASS=odoo