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

[IMP]Odoo images : fix nginx prod and use 2 workers per default

Browse Source
This commit is contained in:
Fabien Bourgeois 2016-11-03 10:50:44 +01:00
parent e081fdb564
commit 21559d0429
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odoo/dev.yml
View File

@ -13,7 +13,7 @@ services:
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
LIST_DB: "True" LIST_DB: "True"
DB_MAXCONN: 20 DB_MAXCONN: 20
WORKERS: 1 WORKERS: 2
LIMIT_TIME_CPU: 3000 LIMIT_TIME_CPU: 3000
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
volumes: volumes:
@ -31,6 +31,6 @@ services:
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
LIST_DB: "True" LIST_DB: "True"
DB_MAXCONN: 20 DB_MAXCONN: 20
WORKERS: 1 WORKERS: 2
LIMIT_TIME_CPU: 3000 LIMIT_TIME_CPU: 3000
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000

2
odoo/odoo/genconf.sh
View File

@ -32,7 +32,7 @@ db_user = $POSTGRES_USER
db_password = $POSTGRES_PASSWORD db_password = $POSTGRES_PASSWORD
db_maxconn = ${DB_MAXCONN:=10} db_maxconn = ${DB_MAXCONN:=10}
list_db = ${LIST_DB:=True} list_db = ${LIST_DB:=True}
workers = ${WORKERS:=1} workers = ${WORKERS:=2}
limit_time_cpu = ${LIMIT_TIME_CPU:=60} limit_time_cpu = ${LIMIT_TIME_CPU:=60}
limit_time_real = ${LIMIT_TIME_REAL:=120} limit_time_real = ${LIMIT_TIME_REAL:=120}
admin_passwd = ${ADMIN_PASSWORD:=admin}" > $CONF admin_passwd = ${ADMIN_PASSWORD:=admin}" > $CONF

4
odoo/prod.yml
View File

@ -2,10 +2,10 @@ version: '2'
services: services:
nginx: nginx:
build: ./nginx build: ./nginx
image: odoonginx:yaltik image: nginx:odoo
environment: environment:
NGINX_HOST: localhost 127.0.0.1 NGINX_HOST: localhost 127.0.0.1
ODOO_HOST: odoo ODOO_SERVICE: odoo
ODOO_SERVER_NAMES: localodoo odoo ocb ODOO_SERVER_NAMES: localodoo odoo ocb
ports: ports:
- "80:80" - "80:80"