From 4d509a3f028251a91f0ae180ec354ecdfc563abc Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 3 Nov 2017 09:07:21 +0100
Subject: [PATCH] #11 Fix the syntax for labels to make it compatible with pip
 docker-compose version 1.17

---
 templates/docker-compose.yml.twig | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index 1d60e8c..fcc86d5 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -1,4 +1,4 @@
-version: "2"
+version: '2'
 
 services:
   mariadb:
@@ -55,7 +55,7 @@ services:
       - php
     environment:
 {% if webserver.type == 'nginx' %}
-      NGINX_STATIC_CONTENT_OPEN_FILE_CACHE: "off"
+      NGINX_STATIC_CONTENT_OPEN_FILE_CACHE: 'off'
       NGINX_ERROR_LOG_LEVEL: debug
 {% elseif webserver.type == 'apache' %}
       APACHE_LOG_LEVEL: debug
@@ -65,9 +65,9 @@ services:
     volumes:
       - ./:/var/www/html
     labels:
-      - 'traefik.backend={{ projectname }}_{{ webserver.type }}_1'
-      - 'traefik.port=80'
-      - 'traefik.frontend.rule=Host:{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_{{ webserver.type }}_1'
+      traefik.port: '80'
+      traefik.frontend.rule: 'Host:{{ projectname }}.docker.localhost'
 {% if varnish.enable %}
 
   varnish:
@@ -79,9 +79,9 @@ services:
       VARNISH_BACKEND_HOST: {{ webserver.type }}
       VARNISH_BACKEND_PORT: 80
     labels:
-      - 'traefik.backend={{ projectname }}_varnish_1'
-      - 'traefik.port=6081'
-      - 'traefik.frontend.rule=Host:varnish.{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_varnish_1'
+      traefik.port: '6081'
+      traefik.frontend.rule: 'Host:varnish.{{ projectname }}.docker.localhost'
 {% endif %}
 
   redis:
@@ -92,9 +92,9 @@ services:
     environment:
       ADMINER_SALT: adminer-salt
     labels:
-      - 'traefik.backend={{ projectname }}_adminer_1'
-      - 'traefik.port=9000'
-      - 'traefik.frontend.rule=Host:adminer.{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_adminer_1'
+      traefik.port: '9000'
+      traefik.frontend.rule: 'Host:adminer.{{ projectname }}.docker.localhost'
 
   pma:
     image: 'phpmyadmin/phpmyadmin'
@@ -105,9 +105,9 @@ services:
       PHP_UPLOAD_MAX_FILESIZE: 1G
       PHP_MAX_INPUT_VARS: 1G
     labels:
-      - 'traefik.backend={{ projectname }}_pma_1'
-      - 'traefik.port=80'
-      - 'traefik.frontend.rule=Host:pma.{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_pma_1'
+      traefik.port: '80'
+      traefik.frontend.rule: 'Host:pma.{{ projectname }}.docker.localhost'
 {% if solr.enable %}
 
   solr:
@@ -115,17 +115,17 @@ services:
     environment:
       SOLR_HEAP: 1024m
     labels:
-      - 'traefik.backend={{ projectname }}_solr_1'
-      - 'traefik.port=8983'
-      - 'traefik.frontend.rule=Host:solr.{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_solr_1'
+      traefik.port: '8983'
+      traefik.frontend.rule: 'Host:solr.{{ projectname }}.docker.localhost'
 {% endif %}
 
   mailhog:
     image: 'mailhog/mailhog'
     labels:
-      - 'traefik.backend={{ projectname }}_mailhog_1'
-      - 'traefik.port=8025'
-      - 'traefik.frontend.rule=Host:mailhog.{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_mailhog_1'
+      traefik.port: '8025'
+      traefik.frontend.rule: 'Host:mailhog.{{ projectname }}.docker.localhost'
 {% if node.enable %}
 
   nodejs:
@@ -133,9 +133,9 @@ services:
     environment:
        NODE_SERVICE_KEY: '{{ node.key }}'
     labels:
-      - 'traefik.backend=nodejs'
-      - 'traefik.port=8080'
-      - 'traefik.frontend.rule=Host:nodejs.{{ projectname }}.docker.localhost'
+      traefik.backend: 'nodejs'
+      traefik.port: '8080'
+      traefik.frontend.rule: 'Host:nodejs.{{ projectname }}.docker.localhost'
     volumes:
       - ./{{ node.path }}:/app
     command: sh -c 'npm install && npm run start'
@@ -144,11 +144,11 @@ services:
     image: 'node:alpine'
     working_dir: /app
     labels:
-      - 'traefik.backend={{ projectname }}_node_1'
-      - 'traefik.port=3000'
-      - 'traefik.frontend.rule=Host:front.{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_node_1'
+      traefik.port: '3000'
+      traefik.frontend.rule: 'Host:front.{{ projectname }}.docker.localhost'
     expose:
-      - "3000"
+      - '3000'
     volumes:
       - ./{{ node.path }}:/app
     command: sh -c 'npm install && npm run start'
@@ -169,7 +169,7 @@ services:
     image: 'arachnysdocker/athenapdf-service'
     environment:
       WEAVER_AUTH_KEY: '{{ athenapdf.key }}'
-      WEAVER_ATHENA_CMD: "athenapdf -S"
+      WEAVER_ATHENA_CMD: 'athenapdf -S'
       WEAVER_MAX_WORKERS: 10
       WEAVER_MAX_CONVERSION_QUEUE: 50
       WEAVER_WORKER_TIMEOUT: 90
@@ -191,9 +191,9 @@ services:
     environment:
       WEBGRIND_PROFILER_DIR: '/mnt/files/xdebug/profiler'
     labels:
-      - 'traefik.backend={{ projectname }}_webgrind_1'
-      - 'traefik.port=8080'
-      - 'traefik.frontend.rule=Host:webgrind.{{ projectname }}.docker.localhost'
+      traefik.backend: '{{ projectname }}_webgrind_1'
+      traefik.port: '8080'
+      traefik.frontend.rule: 'Host:webgrind.{{ projectname }}.docker.localhost'
     volumes:
       - files:/mnt/files
 {% endif %}
-- 
GitLab