Fix #7 - Adding MariaDB 10.2 docker

CONTRIBUTING.md

@@ -9,38 +9,40 @@ Contributors will be credited within the intranet and on the github page.
 
 * [X] Handle emails sent from PHP dockers [#5](https://github.com/cytopia/devilbox/issues/5)
   1. Add another container which is able to display mails: https://github.com/sj26/mailcatcher
-  2. Proxy this webinterface into the Intranet 
+  2. Proxy this webinterface into the Intranet
 
 ## Dockers
 
 * [ ] Add more travis checks to ensure they are always working under any condition
-* [ ] Add more dockers
+* [ ] Add more base dockers
   - [X] MySQL 5.6
   - [X] MySQL 5.7 [#1](https://github.com/cytopia/devilbox/issues/1)
   - [X] MariaDB 5.5 [#2](https://github.com/cytopia/devilbox/issues/2)
   - [X] MariaDB 10.0 [#3](https://github.com/cytopia/devilbox/issues/3)
   - [X] MariaDB 10.2 [#6](https://github.com/cytopia/devilbox/issues/6)
-  - [ ] MariaDB 10.2 [#7](https://github.com/cytopia/devilbox/issues/7)
+  - [X] MariaDB 10.2 [#7](https://github.com/cytopia/devilbox/issues/7)
+  - [ ] PostgreSQL
   - [ ] LightHTTPD
   - [ ] HHVM
-  - [ ] ...
 * [ ] Add optional dockers
-  - [ ] PostgreSQL
   - [ ] Memcached
   - [ ] Redis
   - [ ] MongoDB
   - [ ] CouchDB
   - [ ] Cassandra
-  - [ ] ...
+  - [ ] Apache Solr
+  - [ ] Elasticsearch
 * [ ] Add other stack dockers (instead of PHP)
   - [ ] Go
   - [ ] Python
   - [ ] Ruby
+  - [ ] Perl
 
 
 ## Docker-compose
 
 * [ ] Allow for optional dockers (via `setup.sh` script or similar)
+  - via compose entrypoint overwrite
 
 
 ## Documentation

README.md

@@ -71,7 +71,7 @@ No need to install and configure different versions locally. Simply choose your
 | [![Build Status](https://travis-ci.org/cytopia/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-mainline) [Nginx mainline](https://github.com/cytopia/docker-nginx-mainline) | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-5.5) [MariaDB 5.5](https://github.com/cytopia/docker-mariadb-5.5)  | PostgreSQL 9.5 | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.0) [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
 |       | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.0) [MariaDB 10.0](https://github.com/cytopia/docker-mariadb-10.0) | PostgreSQL 9.6 | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.1) [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
 |       | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.1) [MariaDB 10.1](https://github.com/cytopia/docker-mariadb-10.1) | |
-|       | MariaDB 10.2 | |
+|       | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.2) [MariaDB 10.2](https://github.com/cytopia/docker-mariadb-10.2) | |
 
 <sub>**Note:** Entries without links or without build-status are not yet available, but are coming soon. See [CONTRIBUTING](https://github.com/cytopia/devilbox/blob/master/CONTRIBUTING.md) for tasks and upcoming features.</sub>
 
@@ -85,6 +85,13 @@ No need to install and configure different versions locally. Simply choose your
 | Cassandra 3.0 |             |                  | MongoDB 3.2 | Redis 3.2 |
 |               |             |                  | MongoDB 3.4 | Redis unstable |
 
+<!--
+**Optional search stack**
+
+| Apache Solr | Elasticsearch |
+|-------------|---------------|
+| todo        |               |
+-->
 <!--
 **Optional cgi stack**
 

env-example

@@ -52,6 +52,8 @@ MYSQL_SERVER=mysql-5.5
 #MYSQL_SERVER=mysql-5.7
 #MYSQL_SERVER=mariadb-5.5
 #MYSQL_SERVER=mariadb-10.0
+#MYSQL_SERVER=mariadb-10.1
+#MYSQL_SERVER=mariadb-10.2