roles/element/defaults/main/container.yml

@@ -11,15 +11,12 @@ element_container_image_registry: "docker.io"
 element_container_image_namespace: "vectorim"
 element_container_image_name: "element-web"
 element_container_image_tag: ~
-element_container_image_source: pull
-element_container_image_force_source: >-2
-  {{ element_container_image_tag | default(false, true) | bool }}
 element_container_name: "element-web"
 element_container_restart_policy: >-
   {{ (element_deployment_method == 'docker')
       | ternary('unless-stopped',
         (element_deployment_method == 'podman' |
-          ternary('on-failure', 'always')))
+          ternary('on-failure', 'always'))
   }}
 element_container_full_volumes: >-
   {{ element_container_default_volumes

roles/element/defaults/main/main.yml

@@ -10,9 +10,9 @@ element_dist_path: "{{ element_source_path }}/dist"
 element_config_path: "{{ element_base_path }}/config"
 element_config_file: "{{ element_config_path }}/config.json"
 
-element_host_uid: >-2
+element_host_uid: >-
-  {{ ((element_user_info is defined) and ('uid' in element_user_info))
+  {{ element_user_info is defined
   | ternary(element_user_info.uid, element_user) }}
-element_host_gid: >-2
+element_host_gid: >-
-  {{ ((element_user_info is defined) and ('uid' in element_user_info))
+  {{ element_user_info is defined
   | ternary(element_user_info.group, element_user) }}

roles/element/tasks/deploy-docker.yml

@@ -14,8 +14,8 @@
   community.docker.docker_image:
     name: "{{ element_container_image }}"
     state: "{{ element_state }}"
-    source: "{{ element_container_image_source }}"
+    source: "{{ element_container_source }}"
-    force_source: "{{ element_container_image_force_source }}"
+    force_source: "{{ element_container_image_tag | default(false, true) }}"
 
 - name: Ensure container '{{ element_container_name }}' is {{ element_state }}
   community.docker.docker_container:
@@ -23,7 +23,7 @@
     image: "{{ element_container_image }}"
     state: "{{ (element_state == 'present') | ternary('started', 'absent') }}"
     env: "{{ element_container_env | default(omit) }}"
-    user: "{{ element_container_user | default(omit) }}"
+    user: "{{ element_container_user }}"
     ports: "{{ element_container_ports | default(omit) }}"
     labels: "{{ element_container_labels | default(omit) }}"
     volumes: "{{ element_container_full_volumes }}"

roles/element/tasks/deploy-podman.yml

@@ -3,8 +3,8 @@
   containers.podman.podman_image:
     name: "{{ element_container_image }}"
     state: "{{ element_state }}"
-    pull: "{{ element_container_image_source == 'pull' }}"
+    pull: "{{ element_container_source == 'pull' }}"
-    force: "{{ element_container_image_force_source }}"
+    force: "{{ element_container_image_tag | default(false, true) }}"
 
 - name: Ensure container '{{ element_container_name }}' is {{ element_state }}
   containers.podman.podman_container:
@@ -12,7 +12,7 @@
     image: "{{ element_container_image }}"
     state: "{{ (element_state == 'present') | ternary('started', 'absent') }}"
     env: "{{ element_container_env | default(omit) }}"
-    user: "{{ element_container_user | default(omit) }}"
+    user: "{{ element_container_user }}"
     ports: "{{ element_container_ports | default(omit) }}"
     labels: "{{ element_container_labels | default(omit) }}"
     volumes: "{{ element_container_full_volumes }}"