Revert "Update example"

This reverts commit f8e2b25.

example/README.md

@@ -8,7 +8,7 @@ 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/external-src odoo/local-src odoo/data odoo/features
 
 2. Add a submodule for Odoo (official or OCA/OCB)
 
@@ -21,10 +21,13 @@ Follow the steps:
 
 4. Optionally add custom addons in `odoo/local-src`
 
+5. Copy the configuration template `etc/openerp.cfg.tmpl` in your project, see [the example file](odoo/etc/openerp.cfg.tmpl).
+   Adapt the `addons_path` and the other options if needed.
+
 6. Create the Dockerfile, the bare minimum being (see also [the example
    file](odoo/Dockerfile) that installs additional dependencies):
 
-        FROM camptocamp/odoo-project:11.0
+        FROM camptocamp/odoo-project:9.0
         MAINTAINER <name>
 
         ENV ADDONS_PATH=/opt/odoo/local-src,/opt/odoo/external-src/server-tools,/opt/odoo/src/addons

example/docker-compose.override.yml

@@ -0,0 +1,33 @@
+# used for development
+# docker-compose.override.yml is automatically used by docker-compose when no
+# option -f is provided
+
+version: '2'
+
+services:
+  odoo:
+    tty: true
+    stdin_open: true
+    ports:
+      - 8069
+      - 8072
+    volumes:
+      - "data-odoo-pytest-cache:/opt/odoo/.cache"
+      # to speed build of image customise your .dockerfileignore (this is an help their)
+      - "./odoo:/opt/odoo"
+    environment:
+      - MARABUNTA_MODE=demo  # could be 'full' for the db with all the data
+      - MARABUNTA_ALLOW_SERIE=True  # should not be set in production
+
+  db:
+    ports:
+      - 5432
+
+  nginx:
+    ports:
+      - 80:80
+
+volumes:
+  # store pytest cache, allowing to use --lf or --ff (replay last or first failures)
+  data-odoo-pytest-cache:
+

example/docker-compose.yml

@@ -4,32 +4,22 @@ version: '2'
 
 services:
   odoo:
-    tty: true
-    stdin_open: true
     build: ./odoo/
-    ports:
-      - 8069
     depends_on:
       - db
     volumes:
       - "data-odoo:/data/odoo"
-      - "data-odoo-pytest-cache:/opt/odoo/.cache"
-      # to speed build of image customise your .dockerignore (this is an help there)
-      - "./odoo:/opt/odoo"
     environment:
       - DB_USER=odoo
       - DB_PASS=odoo
       - DB_NAME=odoodb
       - ADMIN_PASSWD=# set me
       - RUNNING_ENV=dev
+      - MARABUNTA_MODE=demo
       - LOG_HANDLER=:WARN
-      - MARABUNTA_MODE=demo  # could be 'full' for the db with all the data
-      - MARABUNTA_ALLOW_SERIE=True  # should not be set in production
 
   db:
     image: postgres:9.6
-    ports:
-      - 5432
     environment:
       - POSTGRES_USER=odoo
       - POSTGRES_PASSWORD=odoo
@@ -38,14 +28,10 @@ services:
 
   # can be useful for dev when longpolling is required
   nginx:
-    image: camptocamp/odoo-nginx:11.0-1.3.0
-    ports:
-      - 80:80
+    image: camptocamp/odoo-nginx:9.0-1.2.1
     depends_on:
       - odoo
 
 volumes:
   data-odoo:
   data-db:
-  # store pytest cache, allowing to use --lf or --ff (replay last or first failures)
-  data-odoo-pytest-cache:

example/odoo/Dockerfile

@@ -1,12 +1,11 @@
-FROM camptocamp/odoo-project:11.0-latest
+FROM camptocamp/odoo-project:10.0-latest
 MAINTAINER Camptocamp
 
-# For installing odoo you have two possibility
-# 1. either adding the whole root directory
+# For installing odoo you have two possibility adding the whole root directory
 #COPY . /opt/odoo
 
-# 2. or adding each directory, this solution will reduce the build and download
-# time of the image on the server (layers are reused)
+# or adding each directory, this solution will reduce the download time
+# of the image on the server (we can reuse layout)
 COPY ./src /opt/odoo/src
 COPY ./external-src /opt/odoo/external-src
 COPY ./local-src /opt/odoo/local-src
@@ -28,6 +27,6 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/*
 
 COPY ./requirements.txt /opt/odoo/
-RUN cd /opt/odoo && pip3 install -r requirements.txt
+RUN cd /opt/odoo && pip install -r requirements.txt
 
 ENV ADDONS_PATH=/opt/odoo/local-src,/opt/odoo/src/addons

example/odoo/Dockerfile-onbuild

@@ -1,4 +1,4 @@
-FROM camptocamp/odoo-project:11.0-latest-onbuild
+FROM camptocamp/odoo-project:10.0-latest-onbuild
 MAINTAINER Camptocamp
 
 # Project's specifics packages
@@ -10,6 +10,6 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/*
 
 COPY ./requirements.txt /opt/odoo/
-RUN cd /opt/odoo && pip3 install -r requirements.txt
+RUN cd /opt/odoo && pip install -r requirements.txt
 
 ENV ADDONS_PATH=/opt/odoo/local-src,/opt/odoo/src/addons

example/odoo/VERSION

@@ -1 +1 @@
-11.0.0
+9.0.0

example/odoo/migration.yml

@@ -2,7 +2,7 @@ migration:
   options:
     install_command: odoo
   versions:
-    - version: 11.0.0
+    - version: 9.0.0
       operations:
         pre:
           - "sh -c 'psql -c \"CREATE EXTENSION pg_trgm;\"'"