ansol/matrix-docker-ansible-deploy
7
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-22 12:35:51 +00:00
Code Issues Projects Releases Wiki Activity

Switch to a better riot-web image (avhost/docker-matrix-riot -> bubuntux/riot-web)

Browse Source 
The new container image is about 20x smaller in size, faster to start up, etc.

This also fixes #26 (Github issue).
This commit is contained in:
Slavi Pantaleev 2019-01-11 21:20:17 +02:00
parent 14a237885a
commit 6d253ff571
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-server/defaults/main.yml
View File

@ -348,7 +348,7 @@ matrix_corporal_debug: false
# you may wish to disable this. # you may wish to disable this.
matrix_riot_web_enabled: true matrix_riot_web_enabled: true
matrix_riot_web_docker_image: "avhost/docker-matrix-riot:v0.17.8" matrix_riot_web_docker_image: "bubuntux/riot-web:v0.17.8"
matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web" matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"

1
roles/matrix-server/tasks/setup/setup_riot_web.yml
View File

@ -26,7 +26,6 @@
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_username }}" group: "{{ matrix_user_username }}"
with_items: with_items:
- {src: "{{ role_path }}/templates/riot-web/riot.im.conf.j2", name: "riot.im.conf"}
- {src: "{{ role_path }}/templates/riot-web/config.json.j2", name: "config.json"} - {src: "{{ role_path }}/templates/riot-web/config.json.j2", name: "config.json"}
- {src: "{{ matrix_riot_web_homepage_template }}", name: "home.html"} - {src: "{{ matrix_riot_web_homepage_template }}", name: "home.html"}
when: matrix_riot_web_enabled when: matrix_riot_web_enabled

2
roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2
View File

@ -43,7 +43,7 @@ server {
{% if matrix_nginx_proxy_enabled %} {% if matrix_nginx_proxy_enabled %}
{# Use the embedded DNS resolver in Docker containers to discover the service #} {# Use the embedded DNS resolver in Docker containers to discover the service #}
resolver 127.0.0.11 valid=5s; resolver 127.0.0.11 valid=5s;
set $backend "matrix-riot-web:8765"; set $backend "matrix-riot-web:80";
proxy_pass http://$backend; proxy_pass http://$backend;
{% else %} {% else %}
{# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}

3
roles/matrix-server/templates/riot-web/riot.im.conf.j2
View File

@ -1,3 +0,0 @@
-p 8765
-A 0.0.0.0
-c 3500

8
roles/matrix-server/templates/systemd/matrix-riot-web.service.j2
View File

@ -9,13 +9,11 @@ ExecStartPre=-/usr/bin/docker kill matrix-riot-web
ExecStartPre=-/usr/bin/docker rm matrix-riot-web ExecStartPre=-/usr/bin/docker rm matrix-riot-web
ExecStart=/usr/bin/docker run --rm --name matrix-riot-web \ ExecStart=/usr/bin/docker run --rm --name matrix-riot-web \
--log-driver=none \ --log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ -v {{ matrix_riot_web_data_path }}/config.json:/etc/riot-web/config.json:ro \
-v {{ matrix_riot_web_data_path }}/config.json:/riot-web/webapp/config.json:ro \ -v {{ matrix_riot_web_data_path }}/home.html:/etc/riot-web/home.html:ro \
-v {{ matrix_riot_web_data_path }}/home.html:/riot-web/webapp/home.html:ro \
-v {{ matrix_riot_web_data_path }}/riot.im.conf:/data/riot.im.conf:ro \
--network={{ matrix_docker_network }} \ --network={{ matrix_docker_network }} \
{% if not matrix_nginx_proxy_enabled %} {% if not matrix_nginx_proxy_enabled %}
-p 127.0.0.1:8765:8765 \ -p 127.0.0.1:8765:80 \
{% endif %} {% endif %}
{{ matrix_riot_web_docker_image }} {{ matrix_riot_web_docker_image }}
ExecStop=-/usr/bin/docker kill matrix-riot-web ExecStop=-/usr/bin/docker kill matrix-riot-web