[REF]Huge improvements on defaults vars, images...
This commit is contained in:
parent
2d9c07c08b
commit
ad3dacb5e8
@ -2,7 +2,9 @@ FROM nginx:stable
|
||||
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
|
||||
|
||||
# Default variables
|
||||
ENV NGINX_HOST localhost
|
||||
ENV NGINX_HOST localhost 127.0.0.1
|
||||
ENV NGINX_PORT 80
|
||||
ENV NGINX_SSL_PORT 443
|
||||
|
||||
# Create sensible CERTS
|
||||
RUN mkdir /etc/nginx/certs
|
||||
|
162
odoo/base.yml
162
odoo/base.yml
@ -2,24 +2,12 @@ version: '2.2'
|
||||
services:
|
||||
postgres95:
|
||||
image: registry.yaltik.net/postgres:yaltik95
|
||||
environment:
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
PGDATA: /opt/odoo/pgdata
|
||||
|
||||
postgres96:
|
||||
image: registry.yaltik.net/postgres:yaltik96
|
||||
environment:
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
PGDATA: /opt/odoo/pgdata
|
||||
|
||||
postgres10:
|
||||
image: registry.yaltik.net/postgres:yaltik10
|
||||
environment:
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
PGDATA: /opt/odoo/pgdata
|
||||
|
||||
odoo8c7:
|
||||
init: true
|
||||
@ -27,35 +15,11 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.8.centos7
|
||||
image: registry.yaltik.net/odoo:yaltik8c7
|
||||
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
|
||||
|
||||
odoo:
|
||||
init: true
|
||||
build: ./odoo
|
||||
image: registry.yaltik.net/odoo:yaltik8
|
||||
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
|
||||
DEV: 0
|
||||
PROXY_MODE: "True"
|
||||
|
||||
openerp60:
|
||||
init: true
|
||||
@ -63,12 +27,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.60
|
||||
image: registry.yaltik.net/openerp:yaltik60
|
||||
environment:
|
||||
XMLRPC_PORT: 8069
|
||||
NETRPC_PORT: 8070
|
||||
ADMIN_PASSWORD: admin
|
||||
POSTGRES_USER: openerp
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
openerpweb60:
|
||||
init: true
|
||||
@ -76,12 +34,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.web.60
|
||||
image: registry.yaltik.net/openerpweb:yaltik60
|
||||
environment:
|
||||
WEB_PORT: 8080
|
||||
OPENERP_HOST: openerp60
|
||||
OPENERP_PORT: 8069
|
||||
OPENERP_PROTOCOL: http
|
||||
PROXY_MODE: "False"
|
||||
|
||||
odoo9:
|
||||
init: true
|
||||
@ -89,17 +41,6 @@ services:
|
||||
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
|
||||
|
||||
odoobase10:
|
||||
init: true
|
||||
@ -107,17 +48,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.10
|
||||
image: registry.yaltik.net/odoo:yaltikbase10
|
||||
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:
|
||||
init: true
|
||||
@ -125,17 +55,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.ext.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
|
||||
|
||||
odoobase10c7:
|
||||
init: true
|
||||
@ -143,17 +62,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.10.centos7
|
||||
image: registry.yaltik.net/odoo:yaltikbase10c7
|
||||
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
|
||||
|
||||
odoo10c7:
|
||||
init: true
|
||||
@ -161,17 +69,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.ext.10.centos7
|
||||
image: registry.yaltik.net/odoo:yaltik10c7
|
||||
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
|
||||
|
||||
odoo11:
|
||||
init: true
|
||||
@ -179,17 +76,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.11
|
||||
image: registry.yaltik.net/odoo:yaltik11
|
||||
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
|
||||
|
||||
odoobase12:
|
||||
init: true
|
||||
@ -197,17 +83,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.12
|
||||
image: registry.yaltik.net/odoo:yaltikbase12
|
||||
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
|
||||
|
||||
odoo12:
|
||||
init: true
|
||||
@ -215,17 +90,6 @@ services:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.ext.12
|
||||
image: registry.yaltik.net/odoo:yaltik12
|
||||
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
|
||||
|
||||
flectra:
|
||||
init: true
|
||||
@ -233,17 +97,6 @@ services:
|
||||
context: ./flectra
|
||||
dockerfile: Dockerfile
|
||||
image: registry.yaltik.net/flectra:yaltik1pg96
|
||||
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: flectra
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
flectrapg10:
|
||||
init: true
|
||||
@ -251,17 +104,6 @@ services:
|
||||
context: ./flectra
|
||||
dockerfile: Dockerfile.pg10
|
||||
image: registry.yaltik.net/flectra:yaltik1pg10
|
||||
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: flectra
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
odoocmd:
|
||||
build:
|
||||
@ -272,7 +114,3 @@ services:
|
||||
build:
|
||||
context: ./backups
|
||||
image: registry.yaltik.net/odoobackup:yaltik
|
||||
environment:
|
||||
ODOO_HOST: odoo
|
||||
ODOO_ADMIN_PASSWORD: admin
|
||||
ODOO_DATABASES: base
|
||||
|
136
odoo/dev.yml
136
odoo/dev.yml
@ -2,197 +2,61 @@ version: '2.2'
|
||||
services:
|
||||
|
||||
nginx:
|
||||
init: true
|
||||
build:
|
||||
context: ./nginx
|
||||
dockerfile: Dockerfile.dev
|
||||
image: registry.yaltik.net/nginx:odoodev
|
||||
environment:
|
||||
PORT: 80
|
||||
NGINX_HOST: localhost 127.0.0.1
|
||||
NGINX_PORT: 80
|
||||
NGINX_SSL_PORT: 443
|
||||
ODOO_SERVICE: odoo
|
||||
ODOO_SERVER_NAMES: localodoo odoo ocb
|
||||
|
||||
odoodev:
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.dev
|
||||
image: registry.yaltik.net/odoodev:yaltik8
|
||||
environment:
|
||||
DB_MAXCONN: 20
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
DEV: 1
|
||||
PROXY_MODE: "False"
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
odoo8c7dev:
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.8.centos7.dev
|
||||
image: registry.yaltik.net/odoodev:yaltik8c7
|
||||
environment:
|
||||
DB_MAXCONN: 20
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
DEV: 1
|
||||
PROXY_MODE: "False"
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
odoodev10:
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.10.dev
|
||||
image: registry.yaltik.net/odoodev:yaltik10
|
||||
environment:
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
odoodev10c7:
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.10.centos7.dev
|
||||
image: registry.yaltik.net/odoodev:yaltik10c7
|
||||
environment:
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
odoodev12:
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.12.dev
|
||||
image: registry.yaltik.net/odoodev:yaltik12
|
||||
environment:
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
openupgrade9:
|
||||
init: true
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.openupgrade.9
|
||||
image: registry.yaltik.net/odoodev:yaltikopenupgrade9
|
||||
environment:
|
||||
DB_MAXCONN: 20
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
openupgrade10:
|
||||
init: true
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.openupgrade.10
|
||||
image: registry.yaltik.net/odoodev:yaltikopenupgrade10
|
||||
environment:
|
||||
DB_MAXCONN: 20
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
flectradev:
|
||||
build:
|
||||
context: ./flectra
|
||||
dockerfile: Dockerfile.dev
|
||||
image: registry.yaltik.net/flectradev:yaltik1pg96
|
||||
environment:
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
POSTGRES_USER: flectra
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
flectradevpg10:
|
||||
init: true
|
||||
build:
|
||||
context: ./flectra
|
||||
dockerfile: Dockerfile.dev.pg10
|
||||
image: registry.yaltik.net/flectradev:yaltik1pg10
|
||||
environment:
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
POSTGRES_USER: flectra
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
@ -1,59 +1,17 @@
|
||||
version: '2.2'
|
||||
services:
|
||||
golemv2:
|
||||
init: true
|
||||
build: .
|
||||
image: registry.yaltik.net/golem:yaltikv2
|
||||
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
|
||||
DEV: 0
|
||||
PROXY_MODE: "True"
|
||||
|
||||
golemmaster:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.master
|
||||
image: registry.yaltik.net/golem:yaltikmaster
|
||||
init: true
|
||||
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
|
||||
DEV: 0
|
||||
PROXY_MODE: "True"
|
||||
|
||||
golem:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.v3
|
||||
image: registry.yaltik.net/golem:yaltikstable
|
||||
init: true
|
||||
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
|
||||
DEV: 0
|
||||
PROXY_MODE: "True"
|
||||
|
@ -4,59 +4,15 @@ services:
|
||||
golemdev2:
|
||||
build: .
|
||||
image: registry.yaltik.net/golem:yaltikv2dev
|
||||
environment:
|
||||
DB_MAXCONN: 20
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
DEV: 1
|
||||
PROXY_MODE: "False"
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
golemdev3:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.v3.dev
|
||||
image: registry.yaltik.net/golem:yaltikv3dev
|
||||
environment:
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
golemdevmaster:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.master.dev
|
||||
image: registry.yaltik.net/golem:yaltikdev
|
||||
environment:
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
@ -2,6 +2,7 @@ FROM registry.yaltik.net/nginx:yaltik
|
||||
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
|
||||
|
||||
# Default variables
|
||||
ENV ODOO_SERVICE odoo
|
||||
ENV ODOO_SERVER_NAMES odoo
|
||||
|
||||
# Copy templates and usefull files
|
||||
|
@ -2,6 +2,7 @@ FROM registry.yaltik.net/nginx:yaltik
|
||||
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
|
||||
|
||||
# Default variables
|
||||
ENV ODOO_SERVICE odoo
|
||||
ENV ODOO_SERVER_NAMES odoo
|
||||
|
||||
# Copy templates and usefull files
|
||||
|
@ -7,7 +7,7 @@ upstream ${SERVICE}longpoll {
|
||||
}
|
||||
|
||||
server {
|
||||
listen ${PORT};
|
||||
listen ${NGINX_PORT};
|
||||
server_name ${SERVER_NAMES};
|
||||
client_max_body_size 500M;
|
||||
keepalive_timeout 120s;
|
||||
|
@ -30,16 +30,16 @@ dbfilter = ${DB_FILTER}
|
||||
db_name = ${DB_NAME}
|
||||
db_host = ${DB_HOST:=postgres}
|
||||
db_port = ${DB_PORT:=5432}
|
||||
db_user = $POSTGRES_USER
|
||||
db_user = ${POSTGRES_USER:=odoo}
|
||||
db_password = $POSTGRES_PASSWORD
|
||||
db_maxconn = ${DB_MAXCONN:=20}
|
||||
list_db = ${LIST_DB:=True}
|
||||
xmlrpc_port = ${XMLRPC_PORT:=8069}
|
||||
longpolling_port = ${LONGPOLLING_PORT:=8072}
|
||||
proxy_mode = ${PROXY_MODE:=True}
|
||||
workers = ${WORKERS:=1}
|
||||
workers = ${WORKERS:=2}
|
||||
limit_time_cpu = ${LIMIT_TIME_CPU:=120}
|
||||
limit_time_real = ${LIMIT_TIME_REAL:=240}
|
||||
limit_memory_soft = ${LIMIT_MEMORY_SOFT:=1342177280}
|
||||
limit_memory_hard = ${LIMIT_MEMORY_HARD:=3221225472}
|
||||
limit_memory_soft = ${LIMIT_MEMORY_SOFT:=2684354560}
|
||||
limit_memory_hard = ${LIMIT_MEMORY_HARD:=6442450944}
|
||||
admin_passwd = ${ADMIN_PASSWORD:=admin}" > $CONF
|
||||
|
@ -4,12 +4,6 @@ services:
|
||||
init: true
|
||||
build: ./nginx
|
||||
image: registry.yaltik.net/nginx:odoo
|
||||
environment:
|
||||
NGINX_HOST: localhost 127.0.0.1
|
||||
NGINX_PORT: 80
|
||||
NGINX_SSL_PORT: 443
|
||||
ODOO_SERVICE: odoo
|
||||
ODOO_SERVER_NAMES: localodoo odoo ocb
|
||||
ports:
|
||||
- "80:80"
|
||||
- "443:443"
|
||||
|
@ -2,79 +2,25 @@ version: '2.2'
|
||||
services:
|
||||
|
||||
odoopy3o10:
|
||||
init: true
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.py3o.10
|
||||
image: registry.yaltik.net/odoo:yaltikpy3o10
|
||||
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
|
||||
|
||||
odoodevpy3o10:
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.py3o.10.dev
|
||||
image: registry.yaltik.net/odoodev:yaltikpy3o10
|
||||
environment:
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
||||
odoopy3o10c7:
|
||||
init: true
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.py3o.10.centos7
|
||||
image: registry.yaltik.net/odoo:yaltikpy3o10c7
|
||||
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
|
||||
|
||||
odoodevpy3o10c7:
|
||||
build:
|
||||
context: ./odoo
|
||||
dockerfile: Dockerfile.py3o.10.centos7.dev
|
||||
image: registry.yaltik.net/odoodev:yaltikpy3o10c7
|
||||
environment:
|
||||
DEV: 1
|
||||
CODE_FOLDER: code
|
||||
ADMIN_PASSWORD: dev
|
||||
XMLRPC_PORT: 8069
|
||||
LONGPOLLING_PORT: 8072
|
||||
LIST_DB: "True"
|
||||
DB_MAXCONN: 20
|
||||
WORKERS: 2
|
||||
LIMIT_TIME_CPU: 3000
|
||||
LIMIT_TIME_REAL: 6000
|
||||
LIMIT_MEMORY_SOFT: 7000000000
|
||||
LIMIT_MEMORY_HARD: 16000000000
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: somethingToChange
|
||||
|
Loading…
Reference in New Issue
Block a user