DEV-1060 Removed enforced double quotes in docker-compose template for 'user' variable

qa
Michael Hähnel 3 years ago
parent db66b7b790
commit beb3ce7e6d

@ -28,7 +28,7 @@ prometheus_services:
- name: "{{ prometheus_id }}" - name: "{{ prometheus_id }}"
image_name: "{{ prometheus_image_name }}" image_name: "{{ prometheus_image_name }}"
image_version: "{{ prom_prometheus_version }}" image_version: "{{ prom_prometheus_version }}"
user: "root" user: '"root"'
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.{{ prometheus_id }}.service={{ prometheus_id }}" - "traefik.http.routers.{{ prometheus_id }}.service={{ prometheus_id }}"
@ -58,7 +58,7 @@ prometheus_services:
- name: "{{ grafana_id }}" - name: "{{ grafana_id }}"
image_name: "{{ grafana_image_name }}" image_name: "{{ grafana_image_name }}"
image_version: "{{ prom_grafana_version }}" image_version: "{{ prom_grafana_version }}"
user: "472" user: '"472"'
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.{{ grafana_id }}.service={{ grafana_id }}" - "traefik.http.routers.{{ grafana_id }}.service={{ grafana_id }}"

@ -8,7 +8,7 @@ version: '3.7'
networks: networks:
{% for network in current_docker.networks %} {% for network in current_docker.networks %}
{{ network.name }}: {{ network.name }}:
external: {{ network.external | default('false') }} external: {{ network.external | default('false') }}
{% if network.ipams is defined %} {% if network.ipams is defined %}
ipam: ipam:
config: config:
@ -41,11 +41,11 @@ services:
{{ service.name }}: {{ service.name }}:
image: "{{ service.image_name }}:{{ service.image_version }}" image: "{{ service.image_name }}:{{ service.image_version }}"
container_name: "{{ service.name }}" container_name: "{{ service.name }}"
restart: {{ service.restart | default('always') }} restart: {{ service.restart | default('always') }}
{% if {% if
service.user is defined service.user is defined
%} %}
user: "{{ service.user }}" user: {{ service.user }}
{% endif %} {% endif %}
{# ########################################## command #} {# ########################################## command #}
{% if {% if

Loading…
Cancel
Save