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

[REF]Odoo compose : do not use extends anymore

This commit is contained in:
Fabien BOURGEOIS 2020-05-12 12:54:16 +02:00
parent 0a054b1699
commit 2d9c07c08b
6 changed files with 183 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
odoo/base.yml
View File

@ -54,6 +54,8 @@ services:
LIST_DB: "False" LIST_DB: "False"
POSTGRES_USER: odoo POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange POSTGRES_PASSWORD: somethingToChange
DEV: 0
PROXY_MODE: "True"
openerp60: openerp60:
init: true init: true
@ -119,13 +121,21 @@ services:
odoo10: odoo10:
init: true init: true
extends:
file: base.yml
service: odoobase10
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.ext.10 dockerfile: Dockerfile.ext.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
odoobase10c7: odoobase10c7:
init: true init: true
@ -147,13 +157,21 @@ services:
odoo10c7: odoo10c7:
init: true init: true
extends:
file: base.yml
service: odoobase10c7
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.ext.10.centos7 dockerfile: Dockerfile.ext.10.centos7
image: registry.yaltik.net/odoo:yaltik10c7 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: odoo11:
init: true init: true
@ -193,13 +211,21 @@ services:
odoo12: odoo12:
init: true init: true
extends:
file: base.yml
service: odoobase12
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.ext.12 dockerfile: Dockerfile.ext.12
image: registry.yaltik.net/odoo:yaltik12 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: flectra:
init: true init: true
@ -221,13 +247,21 @@ services:
flectrapg10: flectrapg10:
init: true init: true
extends:
file: base.yml
service: flectra
build: build:
context: ./flectra context: ./flectra
dockerfile: Dockerfile.pg10 dockerfile: Dockerfile.pg10
image: registry.yaltik.net/flectra:yaltik1pg10 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: odoocmd:
build: build:

62
odoo/dev.yml
View File

@ -16,14 +16,14 @@ services:
ODOO_SERVER_NAMES: localodoo odoo ocb ODOO_SERVER_NAMES: localodoo odoo ocb
odoodev: odoodev:
extends:
file: base.yml
service: odoo
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
image: registry.yaltik.net/odoodev:yaltik8 image: registry.yaltik.net/odoodev:yaltik8
environment: environment:
DB_MAXCONN: 20
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
LIST_DB: "True" LIST_DB: "True"
DB_MAXCONN: 20 DB_MAXCONN: 20
@ -32,16 +32,18 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
DEV: 1 DEV: 1
PROXY_MODE: "False" PROXY_MODE: "False"
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange
odoo8c7dev: odoo8c7dev:
extends:
file: base.yml
service: odoo8c7
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.8.centos7.dev dockerfile: Dockerfile.8.centos7.dev
image: registry.yaltik.net/odoodev:yaltik8c7 image: registry.yaltik.net/odoodev:yaltik8c7
environment: environment:
DB_MAXCONN: 20
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
LIST_DB: "True" LIST_DB: "True"
DB_MAXCONN: 20 DB_MAXCONN: 20
@ -50,16 +52,17 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
DEV: 1 DEV: 1
PROXY_MODE: "False" PROXY_MODE: "False"
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange
odoodev10: odoodev10:
extends:
file: base.yml
service: odoo10
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.10.dev dockerfile: Dockerfile.10.dev
image: registry.yaltik.net/odoodev:yaltik10 image: registry.yaltik.net/odoodev:yaltik10
environment: environment:
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
DEV: 1 DEV: 1
CODE_FOLDER: code CODE_FOLDER: code
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
@ -70,16 +73,17 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_SOFT: 7000000000
LIMIT_MEMORY_HARD: 16000000000 LIMIT_MEMORY_HARD: 16000000000
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange
odoodev10c7: odoodev10c7:
extends:
file: base.yml
service: odoo10c7
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.10.centos7.dev dockerfile: Dockerfile.10.centos7.dev
image: registry.yaltik.net/odoodev:yaltik10c7 image: registry.yaltik.net/odoodev:yaltik10c7
environment: environment:
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
DEV: 1 DEV: 1
CODE_FOLDER: code CODE_FOLDER: code
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
@ -90,11 +94,10 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_SOFT: 7000000000
LIMIT_MEMORY_HARD: 16000000000 LIMIT_MEMORY_HARD: 16000000000
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange
odoodev12: odoodev12:
extends:
file: base.yml
service: odoo12
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.12.dev dockerfile: Dockerfile.12.dev
@ -110,6 +113,10 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_SOFT: 7000000000
LIMIT_MEMORY_HARD: 16000000000 LIMIT_MEMORY_HARD: 16000000000
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange
openupgrade9: openupgrade9:
init: true init: true
@ -148,9 +155,6 @@ services:
POSTGRES_PASSWORD: somethingToChange POSTGRES_PASSWORD: somethingToChange
flectradev: flectradev:
extends:
file: base.yml
service: flectra
build: build:
context: ./flectra context: ./flectra
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
@ -166,13 +170,29 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_SOFT: 7000000000
LIMIT_MEMORY_HARD: 16000000000 LIMIT_MEMORY_HARD: 16000000000
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
POSTGRES_USER: flectra
POSTGRES_PASSWORD: somethingToChange
flectradevpg10: flectradevpg10:
init: true init: true
extends:
file: dev.yml
service: flectradev
build: build:
context: ./flectra context: ./flectra
dockerfile: Dockerfile.dev.pg10 dockerfile: Dockerfile.dev.pg10
image: registry.yaltik.net/flectradev:yaltik1pg10 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

53
odoo/golem/base.yml
View File

@ -1,24 +1,59 @@
version: '2.2' version: '2.2'
services: services:
golemv2: golemv2:
init: true
build: . build: .
image: registry.yaltik.net/golem:yaltikv2 image: registry.yaltik.net/golem:yaltikv2
extends: environment:
file: ../base.yml DB_MAXCONN: 20
service: odoo 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: golemmaster:
build: build:
context: . context: .
dockerfile: Dockerfile.master dockerfile: Dockerfile.master
image: registry.yaltik.net/golem:yaltikmaster image: registry.yaltik.net/golem:yaltikmaster
extends: init: true
file: ../base.yml environment:
service: odoo 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: golem:
build: build:
context: . context: .
dockerfile: Dockerfile.v3 dockerfile: Dockerfile.v3
image: registry.yaltik.net/golem:yaltikstable image: registry.yaltik.net/golem:yaltikstable
extends: init: true
file: ../base.yml environment:
service: odoo 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"

53
odoo/golem/dev.yml
View File

@ -2,26 +2,61 @@ version: '2.2'
services: services:
golemdev2: golemdev2:
extends:
file: ../dev.yml
service: odoodev
build: . build: .
image: registry.yaltik.net/golem:yaltikv2dev 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: golemdev3:
extends:
file: ../dev.yml
service: odoodev10
build: build:
context: . context: .
dockerfile: Dockerfile.v3.dev dockerfile: Dockerfile.v3.dev
image: registry.yaltik.net/golem:yaltikv3dev 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: golemdevmaster:
extends:
file: ../dev.yml
service: odoodev10
build: build:
context: . context: .
dockerfile: Dockerfile.master.dev dockerfile: Dockerfile.master.dev
image: registry.yaltik.net/golem:yaltikdev 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

11
odoo/prod.yml
View File

@ -13,14 +13,3 @@ services:
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
odoo:
extends:
file: base.yml
service: odoo
build:
context: ./odoo
environment:
LIST_DB: "False"
DEV: 0
PROXY_MODE: "True"

10
odoo/py3o.yml
View File

@ -20,7 +20,6 @@ services:
POSTGRES_PASSWORD: somethingToChange POSTGRES_PASSWORD: somethingToChange
odoodevpy3o10: odoodevpy3o10:
extends: odoopy3o10
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.py3o.10.dev dockerfile: Dockerfile.py3o.10.dev
@ -36,6 +35,10 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_SOFT: 7000000000
LIMIT_MEMORY_HARD: 16000000000 LIMIT_MEMORY_HARD: 16000000000
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange
odoopy3o10c7: odoopy3o10c7:
init: true init: true
@ -56,7 +59,6 @@ services:
POSTGRES_PASSWORD: somethingToChange POSTGRES_PASSWORD: somethingToChange
odoodevpy3o10c7: odoodevpy3o10c7:
extends: odoopy3o10c7
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.py3o.10.centos7.dev dockerfile: Dockerfile.py3o.10.centos7.dev
@ -65,6 +67,8 @@ services:
DEV: 1 DEV: 1
CODE_FOLDER: code CODE_FOLDER: code
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
XMLRPC_PORT: 8069
LONGPOLLING_PORT: 8072
LIST_DB: "True" LIST_DB: "True"
DB_MAXCONN: 20 DB_MAXCONN: 20
WORKERS: 2 WORKERS: 2
@ -72,3 +76,5 @@ services:
LIMIT_TIME_REAL: 6000 LIMIT_TIME_REAL: 6000
LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_SOFT: 7000000000
LIMIT_MEMORY_HARD: 16000000000 LIMIT_MEMORY_HARD: 16000000000
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange