Merge remote-tracking branch 'origin/master'

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`. 
 

composer.json

@@ -26,6 +26,7 @@
     "require": {
         "php": ">=5.6",
         "composer-plugin-api": "^1.0.0",
+        "lakedrops/composer-scripts": "^0.1",
         "lakedrops/docker-traefik": "^0.1",
         "lakedrops/dotenv": "^0.1",
         "twig/twig": "^1.23.1"

src/Handler.php

@@ -283,8 +283,7 @@ class Handler {
         'xdebug' => 1,
       ],
       'webserver' => [
-        'type' => 'nginx',
-        'version' => '1.13',
+        'type' => 'apache',
       ],
       'varnish' => [
         'enable' => 0,

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 %}