diff --git a/README.md b/README.md index 2866dd96eb206c383fb10dab08e77731b96393fc..cc8380942f43db862eb228f7f78a2a124b00a4ef 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/composer.json b/composer.json index db6dcc784ac5d4f52bee3934eb52cc7b75333446..3e3e8d75e5b5254e30f198128199c6a0010ce37d 100644 --- a/composer.json +++ b/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" diff --git a/src/Handler.php b/src/Handler.php index f077c41bfce08324e2b6db731e9ff2887eadc3b0..4c2ab63566435cf34e973aa763296297a19c4fab 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -283,8 +283,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 d0598f3081b18e98f32de764c08f90a5f5d5f744..4b14de8637b9f218555be3956e0d4f7a9e1e48a7 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 %}