From 3d620ef54a392c1a6a9fc141dbe692eabe112ac5 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 20 Jul 2017 12:31:10 +0200
Subject: [PATCH] Better handling of whitespace
---
templates/docker-compose.yml.twig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index 9cdbdef..4c2614b 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -44,8 +44,8 @@ services:
- 'traefik.backend={{ projectname }}_{{ webserver.type }}_1'
- 'traefik.port=80'
- 'traefik.frontend.rule=Host:{{ projectname }}.docker.localhost'
-
{% if varnish.enable %}
+
varnish:
image: 'wodby/drupal-varnish:4.1-2.1.2'
depends_on:
@@ -75,8 +75,8 @@ services:
- 'traefik.backend={{ projectname }}_pma_1'
- 'traefik.port=80'
- 'traefik.frontend.rule=Host:pma.{{ projectname }}.docker.localhost'
-
{% if solr.enable %}
+
solr:
image: 'wodby/drupal-solr:{{ drupal.version }}-6.6-2.2.0'
environment:
@@ -93,8 +93,8 @@ services:
- 'traefik.backend={{ projectname }}_mailhog_1'
- 'traefik.port=8025'
- 'traefik.frontend.rule=Host:mailhog.{{ projectname }}.docker.localhost'
-
{% if node.enable %}
+
nodejs:
image: 'wodby/drupal-node:1.0-1.0.0'
environment:
@@ -120,18 +120,18 @@ services:
- ./{{ node.path }}:/app
command: sh -c 'npm install && npm run start'
{% endif %}
-
{% if memcached.enable %}
+
memcached:
image: 'wodby/memcached:1.4-2.0.0'
{% endif %}
-
{% if rsyslog.enable %}
+
rsyslog:
image: 'wodby/rsyslog'
{% endif %}
-
{% if athenapdf.enable %}
+
athenapdf:
image: 'arachnysdocker/athenapdf-service'
environment:
--
GitLab