fix(element): allow arbitrary image tags

This commit is contained in:
Jan Christian Grünhage 2020-11-18 20:34:54 +01:00
parent 719e4919b6
commit dd3765a8b2
No known key found for this signature in database
GPG key ID: 6594C449C633D10C
3 changed files with 5 additions and 2 deletions

View file

@ -56,6 +56,9 @@ element_config:
preferredDomain: jitsi.riot.im
element_domain_configs: []
element_deployment_method: 'webroot' #alternative is 'docker'
element_docker_image: "{{ element_docker_image_base }}:{{ element_docker_image_tag }}"
element_docker_image_base: "docker.io/vectorim/element-web"
element_docker_image_tag: "v{{ element_version }}"
element_docker_ports: []
element_docker_labels: {}
element_docker_volumes: "{{ element_docker_main_volumes + element_docker_domain_volumes }}"

View file

@ -37,7 +37,7 @@
- name: Deploy docker container
docker_container:
name: "element-web"
image: "docker.io/vectorim/riot-web:v{{ element_version }}"
image: "{{ element_docker_image }} }}"
ports: "{{ element_docker_ports }}"
labels: "{{ element_docker_labels_complete }}"
restart_policy: unless-stopped

View file

@ -1,4 +1,4 @@
---
element_docker_labels_complete: "{{ element_docker_labels_base | combine(element_docker_labels) }}"
element_docker_labels_base:
version: "{{ element_version }}"
version: "{{ element_docker_image_tag | default(element_version, true) }}"