Yaltik/docker_images
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[FIX]Remove circular dependency between odoodev and odoo services definitions

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2017-08-03 08:14:25 +02:00
parent f3953a3aff
commit fde99bb3cf
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
odoo/base.yml
View File

@ -30,20 +30,38 @@ services:
POSTGRES_PASSWORD: somethingToChange POSTGRES_PASSWORD: somethingToChange
odoo9: odoo9:
extends:
service: odoo
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.9 dockerfile: Dockerfile.9
image: registry.yaltik.net/odoo:yaltik9 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: odoo10:
extends:
service: odoo
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.10 dockerfile: Dockerfile.10
image: registry.yaltik.net/odoo:yaltik10 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: odoocmd:
build: build: