From 21559d0429f764c6f64638c738de09c4ff4ef6b1 Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Thu, 3 Nov 2016 10:50:44 +0100 Subject: [PATCH] [IMP]Odoo images : fix nginx prod and use 2 workers per default --- odoo/dev.yml | 4 ++-- odoo/odoo/genconf.sh | 2 +- odoo/prod.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/odoo/dev.yml b/odoo/dev.yml index 44100be..691e39e 100644 --- a/odoo/dev.yml +++ b/odoo/dev.yml @@ -13,7 +13,7 @@ services: ADMIN_PASSWORD: dev LIST_DB: "True" DB_MAXCONN: 20 - WORKERS: 1 + WORKERS: 2 LIMIT_TIME_CPU: 3000 LIMIT_TIME_REAL: 6000 volumes: @@ -31,6 +31,6 @@ services: ADMIN_PASSWORD: dev LIST_DB: "True" DB_MAXCONN: 20 - WORKERS: 1 + WORKERS: 2 LIMIT_TIME_CPU: 3000 LIMIT_TIME_REAL: 6000 diff --git a/odoo/odoo/genconf.sh b/odoo/odoo/genconf.sh index 0b4e6bd..b962604 100644 --- a/odoo/odoo/genconf.sh +++ b/odoo/odoo/genconf.sh @@ -32,7 +32,7 @@ db_user = $POSTGRES_USER db_password = $POSTGRES_PASSWORD db_maxconn = ${DB_MAXCONN:=10} list_db = ${LIST_DB:=True} -workers = ${WORKERS:=1} +workers = ${WORKERS:=2} limit_time_cpu = ${LIMIT_TIME_CPU:=60} limit_time_real = ${LIMIT_TIME_REAL:=120} admin_passwd = ${ADMIN_PASSWORD:=admin}" > $CONF diff --git a/odoo/prod.yml b/odoo/prod.yml index 5fe9718..67f982d 100644 --- a/odoo/prod.yml +++ b/odoo/prod.yml @@ -2,10 +2,10 @@ version: '2' services: nginx: build: ./nginx - image: odoonginx:yaltik + image: nginx:odoo environment: NGINX_HOST: localhost 127.0.0.1 - ODOO_HOST: odoo + ODOO_SERVICE: odoo ODOO_SERVER_NAMES: localodoo odoo ocb ports: - "80:80"