From 4a8199590834d23590f6277e220c46e7418d7a21 Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Mon, 3 Oct 2016 16:04:51 +0200 Subject: [PATCH] [IMP]Directory reorganization : images now contains basic compose files and use build directory, not only images --- framasoft/mypads.yml | 6 ++++-- odoo/base.yml | 20 ++++++++++++++++++++ odoo/dev.yml | 12 ++++++++++++ odoo/golem/base.yml | 8 ++++++++ odoo/golem/dev.yml | 9 +++++++++ odoo/prod.yml | 12 ++++++++++++ 6 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 odoo/base.yml create mode 100644 odoo/dev.yml create mode 100644 odoo/golem/base.yml create mode 100644 odoo/golem/dev.yml create mode 100644 odoo/prod.yml diff --git a/framasoft/mypads.yml b/framasoft/mypads.yml index 50eef93..1f1301a 100644 --- a/framasoft/mypads.yml +++ b/framasoft/mypads.yml @@ -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: diff --git a/odoo/base.yml b/odoo/base.yml new file mode 100644 index 0000000..12a2259 --- /dev/null +++ b/odoo/base.yml @@ -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 diff --git a/odoo/dev.yml b/odoo/dev.yml new file mode 100644 index 0000000..f09cf65 --- /dev/null +++ b/odoo/dev.yml @@ -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" diff --git a/odoo/golem/base.yml b/odoo/golem/base.yml new file mode 100644 index 0000000..3afb1ad --- /dev/null +++ b/odoo/golem/base.yml @@ -0,0 +1,8 @@ +version: '2' +services: + odoo: + build: ./golem + image: golem:base + extends: + file: ../base.yml + service: odoo diff --git a/odoo/golem/dev.yml b/odoo/golem/dev.yml new file mode 100644 index 0000000..e27f231 --- /dev/null +++ b/odoo/golem/dev.yml @@ -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 diff --git a/odoo/prod.yml b/odoo/prod.yml new file mode 100644 index 0000000..c3d670c --- /dev/null +++ b/odoo/prod.yml @@ -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"