From 9c32109168fe9893128f5a27cbe9e26d8e6ae46e Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 8 Jan 2018 12:44:05 +0100
Subject: [PATCH] #18 Change webserver default to apache
---
README.md | 5 ++---
src/Handler.php | 3 +--
templates/docker-compose.yml.twig | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index dc957a1..f17b655 100644
--- a/README.md
+++ b/README.md
@@ -220,8 +220,7 @@ To overwrite the default settings for the Docker environment, add the relevant p
"xdebug": 1
},
"webserver": {
- "type": "nginx",
- "version": "1.13"
+ "type": "apache"
},
"varnish": {
"enable": 0
@@ -266,7 +265,7 @@ To overwrite the default settings for the Docker environment, add the relevant p
Other supported values for the PHP version are `5.3`, `5.6` and `7.1`.
-Other supported value for the webserver type is `apache`.
+Other supported value for the webserver type is `nginx`.
Supported versions for `nginx`: `1.13`, `1.12`, `1.10`.
diff --git a/src/Handler.php b/src/Handler.php
index 781f563..e9d1353 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -281,8 +281,7 @@ class Handler {
'xdebug' => 1,
],
'webserver' => [
- 'type' => 'nginx',
- 'version' => '1.13',
+ 'type' => 'apache',
],
'varnish' => [
'enable' => 0,
diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index d0598f3..4b14de8 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -51,7 +51,7 @@ services:
{{ webserver.type }}:
{% if webserver.type == 'nginx' %}
- image: 'wodby/drupal-nginx:{{ drupal.version }}-{{ webserver.version }}'
+ image: 'wodby/drupal-nginx:{{ drupal.version }}-{{ webserver.version|default("1.13") }}'
{% elseif webserver.type == 'apache' %}
image: 'wodby/php-apache:2.4'
{% endif %}
--
GitLab