diff --git a/roles/cmp-docker-proxy/tasks/main.yml b/roles/cmp-docker-proxy/tasks/main.yml index e2ca9eb9..31d6f8e9 100644 --- a/roles/cmp-docker-proxy/tasks/main.yml +++ b/roles/cmp-docker-proxy/tasks/main.yml @@ -1,6 +1,6 @@ # run_once_cmp_docker_proxy: deactivated -# To load the proxy first is just implemented due to some issues with BBB +# Load the proxy first, so that openresty handlers are flushed before the main docker compose - name: "For '{{ application_id }}': include role srv-proxy-6-6-domain" include_role: name: srv-proxy-6-6-domain diff --git a/roles/svc-prx-openresty/tasks/main.yml b/roles/svc-prx-openresty/tasks/main.yml index 663e222e..18a5a7f9 100644 --- a/roles/svc-prx-openresty/tasks/main.yml +++ b/roles/svc-prx-openresty/tasks/main.yml @@ -2,5 +2,8 @@ - name: "For '{{ application_id }}': Load docker-compose" include_role: name: docker-compose + vars: + docker_compose_flush_handlers: true + docker_pull_git_repository: false # Deactivated here to deactivate inhirement - include_tasks: utils/run_once.yml when: run_once_svc_prx_openresty is not defined \ No newline at end of file diff --git a/roles/svc-prx-openresty/vars/main.yml b/roles/svc-prx-openresty/vars/main.yml index 1a416ac2..4c650551 100644 --- a/roles/svc-prx-openresty/vars/main.yml +++ b/roles/svc-prx-openresty/vars/main.yml @@ -8,7 +8,3 @@ database_type: "" openresty_image: "openresty/openresty" openresty_version: "alpine" openresty_container: "{{ applications | get_app_conf(application_id, 'docker.services.openresty.name', True) }}" - -# Docker -docker_compose_flush_handlers: true -docker_pull_git_repository: false # Deactivated here to don't inhire this \ No newline at end of file diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml index c06a2c15..940de3c2 100644 --- a/roles/web-app-bigbluebutton/tasks/main.yml +++ b/roles/web-app-bigbluebutton/tasks/main.yml @@ -2,7 +2,8 @@ - name: "load docker, proxy for '{{application_id}}'" include_role: name: cmp-docker-proxy - + vars: + docker_compose_flush_handlers: false - name: "include 04_seed-database-to-backup.yml" include_tasks: "{{ playbook_dir }}/roles/sys-bkp-docker-2-loc/tasks/04_seed-database-to-backup.yml" diff --git a/roles/web-app-bigbluebutton/vars/main.yml b/roles/web-app-bigbluebutton/vars/main.yml index 176eff5f..a2d43452 100644 --- a/roles/web-app-bigbluebutton/vars/main.yml +++ b/roles/web-app-bigbluebutton/vars/main.yml @@ -16,5 +16,4 @@ http_port: "{{ ports.localhost.http[application_id] }}" docker_compose_skipp_file_creation: true # Handled in this role docker_repository_address: "{{ applications | get_app_conf(application_id, 'docker.services.bigbluebutton.repository') }}" docker_repository_branch: "{{ applications | get_app_conf(application_id, 'docker.services.bigbluebutton.version') }}" -docker_pull_git_repository: true -docker_compose_flush_handlers: false \ No newline at end of file +docker_pull_git_repository: true \ No newline at end of file