diff --git a/framasoft/mypads.yml b/framasoft/mypads.yml index 1f1301a..73a4d00 100644 --- a/framasoft/mypads.yml +++ b/framasoft/mypads.yml @@ -16,6 +16,8 @@ services: frametherpad: build: ./frametherpad image: frametherpad:latest + depends_on: + - framapg ports: - "9001:9001" links: diff --git a/odoo/odoo/launch b/odoo/odoo/launch index 6d9e0d9..47a58da 100755 --- a/odoo/odoo/launch +++ b/odoo/odoo/launch @@ -27,7 +27,7 @@ echo " ; Configuration file auto-generated addons_path = $ADDONS_PATH data_dir = /opt/odoo/data -db_host = db +db_host = postgres db_port = 5432 db_user = $POSTGRES_USER db_password = $POSTGRES_PASSWORD