Update to docker4drupal version 2.30

README.md

@@ -205,8 +205,15 @@ To overwrite the default settings for the Docker environment, add the relevant p
         "varnish": {
           "enable": 0
         },
+        "redis": {
+          "version": "4.0"
+        },
+        "adminer": {
+          "version": "4.3"
+        },
         "solr": {
-          "enable": 0
+          "enable": 0,
+          "version": "6.6"
         },
         "node": {
           "enable": 0,
@@ -230,7 +237,15 @@ 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 `apache`.
+
+Supported versions for `nginx`: `1.13`, `1.12`, `1.10` 
+
+Other supported value for the Redis version is `3.2`.
+
+Other supported value for the Adminer version is `4.2`.
+
+Other supported values for the Solr version are `6.5`, `6.4`, `6.3`, `5.5` and `5.4`.
 
 Once you've changed those values, run `composer update` and the environment will be re-configured. The next time you start your Docker environment those new values will be used.
 

src/Handler.php

 <?php
 
-/**
- * @file
- * Contains \LakeDrops\Docker4Drupal\Handler.
- */
-
 namespace LakeDrops\Docker4Drupal;
 
 use Composer\Package\PackageInterface;
@@ -117,7 +112,7 @@ class Handler {
       $settingsPath = 'settings/default';
     }
 
-    // Provide all the requiired files
+    // Provide all the required files
     $twig_loader = new \Twig_Loader_Array([]);
     $twig = new \Twig_Environment($twig_loader);
     $options['webRoot'] = $webRoot . '/';
@@ -205,18 +200,25 @@ class Handler {
           'version' => '8',
         ],
         'php' => [
-          'version' => '7.0',# 5.3|5.6|7.1
+          'version' => '7.0',
           'xdebug' => 1,
         ],
         'webserver' => [
-          'type' => 'nginx',# apache
+          'type' => 'nginx',
           'version' => '1.13',
         ],
         'varnish' => [
           'enable' => 0,
         ],
+        'redis' => [
+          'version' => '4.0',
+        ],
+        'adminer' => [
+          'version' => '4.3',
+        ],
         'solr' => [
           'enable' => 0,
+          'version' => '6.6',
         ],
         'node' => [
           'enable' => 0,

src/Plugin.php

 <?php
-/**
- * @file
- * Contains LakeDrops\Docker4Drupal\Plugin.
- */
 
 namespace LakeDrops\Docker4Drupal;
 

templates/aliases.drushrc.php.twig

@@ -2,7 +2,7 @@
 
 $aliases['dev'] = array(
   'root' => '/var/www/html/{{ webRoot }}',
-  'uri' => '{{ projectname }}.docker.localhost',
+  'uri' => '{{ projectname }}.docker.localhost:8000',
 );
 
 $aliases['live'] = array(

templates/docker-compose.yml.twig

@@ -2,7 +2,7 @@ version: "2"
 
 services:
   mariadb:
-    image: 'wodby/mariadb:10.1-2.3.3'
+    image: 'wodby/mariadb:10.1'
     environment:
       MYSQL_ROOT_PASSWORD: password
       MYSQL_DATABASE: drupal
@@ -10,9 +10,14 @@ services:
       MYSQL_PASSWORD: drupal
 
   php:
-    image: 'wodby/drupal-php:{{ php.version }}-2.4.3'
+    image: 'wodby/drupal-php:{{ php.version }}'
     environment:
       PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
+      DB_HOST: mariadb
+      DB_USER: drupal
+      DB_PASSWORD: drupal
+      DB_NAME: drupal
+      DB_DRIVER: mysql
 {% if php.xdebug %}
       PHP_XDEBUG: 1
       PHP_XDEBUG_DEFAULT_ENABLE: 1
@@ -29,13 +34,19 @@ services:
 
   {{ webserver.type }}:
 {% if webserver.type == 'nginx' %}
-    image: 'wodby/drupal-nginx:{{ drupal.version }}-{{ webserver.version }}-2.4.2'
+    image: 'wodby/drupal-nginx:{{ drupal.version }}-{{ webserver.version }}'
 {% elseif webserver.type == 'apache' %}
-    image: 'wodby/drupal-apache:2.4-1.0.2'
+    image: 'wodby/drupal-apache:2.4'
 {% endif %}
     depends_on:
       - php
     environment:
+{% if webserver.type == 'nginx' %}
+      NGINX_STATIC_CONTENT_OPEN_FILE_CACHE: "off"
+      NGINX_ERROR_LOG_LEVEL: debug
+{% elseif webserver.type == 'apache' %}
+      APACHE_LOG_LEVEL: debug
+{% endif %}
       {{ webserver.type|upper }}_BACKEND_HOST: php
       {{ webserver.type|upper }}_SERVER_ROOT: /var/www/html/{{ webRoot }}
     volumes:
@@ -47,7 +58,7 @@ services:
 {% if varnish.enable %}
 
   varnish:
-    image: 'wodby/drupal-varnish:4.1-2.1.2'
+    image: 'wodby/drupal-varnish:4.1'
     depends_on:
       - {{ webserver.type }}
     environment:
@@ -61,7 +72,16 @@ services:
 {% endif %}
 
   redis:
-    image: 'wodby/redis:3.2-2.1.2'
+    image: 'wodby/redis:{{ redis.version }}'
+
+  adminer:
+    image: 'wodby/adminer:{{ adminer.version }}'
+    environment:
+      ADMINER_SALT: adminer-salt
+    labels:
+      - 'traefik.backend={{ projectname }}_adminer_1'
+      - 'traefik.port=9000'
+      - 'traefik.frontend.rule=Host:adminer.{{ projectname }}.docker.localhost'
 
   pma:
     image: 'phpmyadmin/phpmyadmin'
@@ -78,7 +98,7 @@ services:
 {% if solr.enable %}
 
   solr:
-    image: 'wodby/drupal-solr:{{ drupal.version }}-6.6-2.2.0'
+    image: 'wodby/drupal-solr:{{ drupal.version }}-{{ solr.version }}'
     environment:
       SOLR_HEAP: 1024m
     labels:
@@ -96,7 +116,7 @@ services:
 {% if node.enable %}
 
   nodejs:
-    image: 'wodby/drupal-node:1.0-1.0.0'
+    image: 'wodby/drupal-node:1.0'
     environment:
        NODE_SERVICE_KEY: '{{ node.key }}'
     labels:
@@ -123,7 +143,7 @@ services:
 {% if memcached.enable %}
 
   memcached:
-    image: 'wodby/memcached:1.4-2.0.0'
+    image: 'wodby/memcached:1.4'
 {% endif %}
 {% if rsyslog.enable %}