big bang

Author: Tardo

.gitignore

@@ -1,5 +1,5 @@
 __pycache__/
 /.pytest_cache
 /.venv
-tests/data/addons/git
-!tests/data/addons/git/repos.yaml
+tests/data/project_demo/addons/git/*
+!tests/data/project_demo/addons/git/repos.yaml

README.md

@@ -1,5 +1,6 @@
 # ISO ODOO (isOdoo)
 
+<<<<<<< HEAD
 ** UNDER DEVELOPMENT. PROJECT NOR READY FOR PRODUCTION **
 
 
@@ -30,6 +31,39 @@ To configure Odoo, simply use environment variables with the prefix ```OCONF_{Pa
 
 | Port | Odoo Version |Description |
 |----------------|-------------|
+||||||| (empty tree)
+=======
+*** PROJECT UNDER DEVELOPMENT. NOT READY FOR PRODUCTION ***
+
+
+A lightweight image for running Odoo from 6.0 to the moon! Strongly inspired by the doodba project and the official Odoo image.
+
+
+## :page_with_curl: Features
+
+- Installation from source code
+- Detect missing modules at build time 1
+- Automatically obtains and downloads modules dependencies
+- Strong use of virtual environments
+
+## :bulb: Documentation
+
+To configure Odoo, simply use environment variables with the prefix ```OCONF_{Param Name}```. Example for changing workers: ```OCONF_workers=4```.
+
+** On Odoo 6.1 you can use environment variables with the prefix ```OWCONF_{Param Name}``` (taking into account that the underscores will be replaced by dots).
+
+### Other Env. Variables
+
+| Name | Description | Required |
+|----------------|-------------|-------------|
+| GITHUB_TOKEN | User token to use with git-aggregator | No |
+
+
+### Default Ports
+
+| Port | Odoo Version |Description |
+|----------------|-------------|-------------|
+>>>>>>> 800e548 (big bang)
 | 8069 | 6.1+ | Default port for HTTP and XML-RPC (web interface and API) |
 | 8071 | 6.0+ | **Optional** port for XML-RPC (depends on configuration) |
 | 8072 | 6.0+ | Port for long polling (real-time notifications, such as chat) |

tests/data/project_demo/addons/git/odoo

@@ -0,0 +1,11 @@
+# See https://github.com/acsone/git-aggregator
+./odoo:
+  defaults:
+    depth: $GIT_DEPTH_NORMAL
+  remotes:
+    odoo: https://github.com/odoo/odoo.git
+  target: odoo $ODOO_VERSION
+  merges:
+    - odoo $ODOO_VERSION
+    # Example of a merge of the PR with the number <PR>
+    # - ocb refs/pull/<PR>/head