From beb3ce7e6de5f50a6d26e33109ef0215c91d3924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=A4hnel?= <michael.haehnel@netgo.de>
Date: Thu, 1 Jun 2023 09:52:23 +0000
Subject: [PATCH] DEV-1060 Removed enforced double quotes in docker-compose
 template for 'user' variable

---
 roles/prometheus/vars/main.yml          | 4 ++--
 templates/_docker/docker-compose.yml.j2 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/prometheus/vars/main.yml b/roles/prometheus/vars/main.yml
index d2a97ba..d49abd7 100644
--- a/roles/prometheus/vars/main.yml
+++ b/roles/prometheus/vars/main.yml
@@ -28,7 +28,7 @@ prometheus_services:
   - name: "{{ prometheus_id }}"
     image_name: "{{ prometheus_image_name }}"
     image_version: "{{ prom_prometheus_version }}"
-    user: "root"
+    user: '"root"'
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.{{ prometheus_id }}.service={{ prometheus_id }}"
@@ -58,7 +58,7 @@ prometheus_services:
   - name: "{{ grafana_id }}"
     image_name: "{{ grafana_image_name }}"
     image_version: "{{ prom_grafana_version }}"
-    user: "472"
+    user: '"472"'
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.{{ grafana_id }}.service={{ grafana_id }}"
diff --git a/templates/_docker/docker-compose.yml.j2 b/templates/_docker/docker-compose.yml.j2
index a8194b8..28f02ed 100644
--- a/templates/_docker/docker-compose.yml.j2
+++ b/templates/_docker/docker-compose.yml.j2
@@ -8,7 +8,7 @@ version: '3.7'
 networks:
 {% for network in current_docker.networks %}
   {{ network.name }}:
-    external: {{ network.external | default('false') }}
+    external: {{ network.external | default('false') }}
 {% if network.ipams is defined %}
     ipam:
       config:
@@ -41,11 +41,11 @@ services:
   {{ service.name }}:
     image: "{{ service.image_name }}:{{ service.image_version }}"
     container_name: "{{ service.name }}"
-    restart: {{ service.restart | default('always') }}
+    restart: {{ service.restart | default('always') }}
 {% if
   service.user is defined
 %}
-    user: "{{ service.user }}"
+    user: {{ service.user }}
 {% endif %}
 {# ########################################## command #}
 {% if