#14 Provide an option to either use pma (default) or adminer

README.md

@@ -214,8 +214,8 @@ To overwrite the default settings for the Docker environment, add the relevant p
         "redis": {
           "version": "4.0"
         },
-        "adminer": {
-          "version": "4.3"
+        "dbbrowser": {
+          "type": "pma"
         },
         "solr": {
           "enable": 0,
@@ -253,11 +253,11 @@ Other supported values for the PHP version are `5.3`, `5.6` and `7.1`.
 
 Other supported value for the webserver type is `apache`.
 
-Supported versions for `nginx`: `1.13`, `1.12`, `1.10` 
+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 value for the dbbrowser type is `adminer`. In that case you should also add a version element with either `4.3` or `4.2`.
 
 Other supported values for the Solr version are `6.5`, `6.4`, `6.3`, `5.5` and `5.4`.
 

src/Handler.php

@@ -239,8 +239,8 @@ class Handler {
       'redis' => [
         'version' => '4.0',
       ],
-      'adminer' => [
-        'version' => '4.3',
+      'dbbrowser' => [
+        'type' => 'pma',
       ],
       'solr' => [
         'enable' => 0,

templates/docker-compose.yml.twig

@@ -87,15 +87,16 @@ services:
   redis:
     image: 'wodby/redis:{{ redis.version }}'
 
+{% if dbbrowser.type == 'adminer' %}
   adminer:
-    image: 'wodby/adminer:{{ adminer.version }}'
+    image: 'wodby/adminer:{{ dbbrowser.version|default("4.3") }}'
     environment:
       ADMINER_SALT: adminer-salt
     labels:
       traefik.backend: '{{ projectname }}_adminer_1'
       traefik.port: '9000'
       traefik.frontend.rule: 'Host:adminer.{{ projectname }}.docker.localhost'
-
+{% elseif dbbrowser.type == 'pma' %}
   pma:
     image: 'phpmyadmin/phpmyadmin'
     environment:
@@ -108,6 +109,7 @@ services:
       traefik.backend: '{{ projectname }}_pma_1'
       traefik.port: '80'
       traefik.frontend.rule: 'Host:pma.{{ projectname }}.docker.localhost'
+{% endif %}
 {% if solr.enable %}
 
   solr: