From fde99bb3cf8f4f3eeac124e7d1afc0e739d3f094 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Thu, 3 Aug 2017 08:14:25 +0200 Subject: [PATCH] [FIX]Remove circular dependency between odoodev and odoo services definitions --- odoo/base.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/odoo/base.yml b/odoo/base.yml index d005881..edb66ae 100644 --- a/odoo/base.yml +++ b/odoo/base.yml @@ -30,20 +30,38 @@ services: POSTGRES_PASSWORD: somethingToChange odoo9: - extends: - service: odoo build: context: ./odoo dockerfile: Dockerfile.9 image: registry.yaltik.net/odoo:yaltik9 + environment: + DB_MAXCONN: 20 + XMLRPC_PORT: 8069 + LONGPOLLING_PORT: 8072 + WORKERS: 2 + LIMIT_TIME_CPU: 720 + LIMIT_TIME_REAL: 1440 + ADMIN_PASSWORD: somethingToChange + LIST_DB: "False" + POSTGRES_USER: odoo + POSTGRES_PASSWORD: somethingToChange odoo10: - extends: - service: odoo build: context: ./odoo dockerfile: Dockerfile.10 image: registry.yaltik.net/odoo:yaltik10 + environment: + DB_MAXCONN: 20 + XMLRPC_PORT: 8069 + LONGPOLLING_PORT: 8072 + WORKERS: 2 + LIMIT_TIME_CPU: 720 + LIMIT_TIME_REAL: 1440 + ADMIN_PASSWORD: somethingToChange + LIST_DB: "False" + POSTGRES_USER: odoo + POSTGRES_PASSWORD: somethingToChange odoocmd: build: