Merge remote-tracking branch 'origin/master'

src/Handler.php

@@ -84,7 +84,7 @@ class Handler extends BaseHandler {
       ],
       'dbserver' => [
         'type' => 'mariadb',
-        'version' => '10.5',
+        'version' => '10.6',
       ],
       'webserver' => [
         'type' => 'apache',
@@ -133,6 +133,12 @@ class Handler extends BaseHandler {
       'webgrind' => [
         'enable' => 0,
       ],
+      'selenium' => [
+        'enable' => 0,
+      ],
+      'elasticsearch' => [
+        'enable' => 0,
+      ],
       'wkhtmltox' => [
         'enable' => 0,
       ],

templates/docker-compose.yml.twig

@@ -75,7 +75,7 @@ services:
       - '{{ projectname }}.{{ traefik.domain }}:{{ docker0.ip }}'
 
   {{ webserver.type }}:
-    image: {% if webserver.type == 'nginx' %}'wodby/drupal-nginx:{{ webserver.version|default("1.18") }}'{% elseif webserver.type == 'apache' %}'wodby/apache:2.4'{% endif %}
+    image: {% if webserver.type == 'nginx' %}'wodby/drupal-nginx:{{ webserver.version|default("1.21") }}'{% elseif webserver.type == 'apache' %}'wodby/apache:2.4'{% endif %}
 
     depends_on:
       - php
@@ -104,7 +104,7 @@ services:
 {% if varnish.enable %}
 
   varnish:
-    image: 'wodby/varnish:4.1'
+    image: 'wodby/varnish:6.0'
     depends_on:
       - {{ webserver.type }}
     environment:
@@ -122,7 +122,7 @@ services:
 
 {% if dbbrowser.type == 'adminer' %}
   adminer:
-    image: 'wodby/adminer:{{ dbbrowser.version|default("4.7") }}'
+    image: 'wodby/adminer:{{ dbbrowser.version|default("4.6") }}'
     environment:
       ADMINER_SALT: adminer-salt
     labels:
@@ -132,7 +132,7 @@ services:
       traefik.http.routers.{{ projectname }}_adminer.rule: Host(`adminer-{{ projectname }}.{{ traefik.domain }}`)
 {% elseif dbbrowser.type == 'pma' %}
   pma:
-    image: 'phpmyadmin/phpmyadmin:5'
+    image: 'phpmyadmin/phpmyadmin:latest'
     environment:
       PMA_HOST: mariadb
       PMA_USER: drupal
@@ -232,7 +232,7 @@ services:
 
   webgrind:
     # add XDEBUG_PROFILE=1 to your request to profile that
-    image: 'wodby/webgrind:1.7'
+    image: 'wodby/webgrind:1'
     environment:
       WEBGRIND_PROFILER_DIR: '/mnt/files/xdebug/profiler'
     labels:
@@ -243,11 +243,10 @@ services:
     volumes:
       - {{ projectroot }}/files:/mnt/files
 {% endif %}
+{% if selenium.enable %}
 
   hub:
-    image: 'tianon/true'
-    entrypoint: '/true'
-    #image: 'elgalu/selenium'
+    image: 'elgalu/selenium'
     volumes:
       - /dev/shm:/dev/shm
     privileged: true
@@ -261,9 +260,7 @@ services:
       - php
 
   chrome:
-    image: 'tianon/true'
-    entrypoint: '/true'
-    #image: 'elgalu/selenium'
+    image: 'elgalu/selenium'
     depends_on:
       - hub
     volumes:
@@ -286,6 +283,18 @@ services:
       # noVNC: See what's going on by hitting http://0.0.0.0:6080 in your browser
       #        Important: http://127.0.0.1:6081 works but http://localhost:6081 doesn't
       #- 6080:26080
+{% endif %}
+{% if elasticsearch.enable %}
+
+  elasticsearch:
+    image: 'wodby/elasticsearch:7'
+    environment:
+      discovery.type: single-node
+      ES_JAVA_OPTS: '-Xms512m -Xmx512m'
+    ports:
+      - 9200
+      - 9300
+{% endif %}
 
 networks:
   default: