[IMP]Directory reorganization : images now contains basic compose files and use build directory, not only images

This commit is contained in:
Fabien Bourgeois 2016-10-03 16:04:51 +02:00
parent acbd9ccca6
commit 4a81995908
6 changed files with 65 additions and 2 deletions

View File

@ -1,7 +1,8 @@
version: '2'
services:
framapg:
image: framapg
build: ./framapg
image: framapg:latest
environment:
POSTGRES_USER: mypads
POSTGRES_PASSWORD: 1njohpqmcZ+mimtyMkn5
@ -13,7 +14,8 @@ services:
- /home/fabien/tmp/francesca/francesca:/var/lib/postgresql/data
frametherpad:
image: frametherpad
build: ./frametherpad
image: frametherpad:latest
ports:
- "9001:9001"
links:

20
odoo/base.yml Normal file
View File

@ -0,0 +1,20 @@
version: '2'
services:
postgres:
image: postgres:9.5
environment:
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange
odoo:
build: ./odoo
image: odoo:8.0
environment:
DB_MAXCONN: 20
WORKERS: 2
LIMIT_TIME_CPU: 720
LIMIT_TIME_REAL: 1440
ADMIN_PASSWORD: somethingToChange
LIST_DB: "False"
POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange

12
odoo/dev.yml Normal file
View File

@ -0,0 +1,12 @@
version: '2'
services:
odoodev:
extends:
file: base.yml
service: odoo
environment:
ADMIN_PASSWORD: admin
LIST_DB: "True"
ports:
- "8069:8069"
- "8072:8072"

8
odoo/golem/base.yml Normal file
View File

@ -0,0 +1,8 @@
version: '2'
services:
odoo:
build: ./golem
image: golem:base
extends:
file: ../base.yml
service: odoo

9
odoo/golem/dev.yml Normal file
View File

@ -0,0 +1,9 @@
version: '2'
services:
odoo:
extends:
file: base.yml
service: odoo
volumes:
- /home/fabien/bak/code/odoo/yaltik:/opt/odoo/extra-addons/yaltik:ro
- /home/fabien/bak/code/odoo/golem:/opt/odoo/extra-addons/golem:ro

12
odoo/prod.yml Normal file
View File

@ -0,0 +1,12 @@
version: '2'
services:
nginx:
build: ./nginx
image: odoonginx:latest
environment:
NGINX_HOST: localhost 127.0.0.1
ODOO_SERVER_NAMES: localodoo odoo ocb
LIST_DB: "False"
ports:
- "80:80"
- "443:443"