Fix #3 - Adding MariaDB 10.0 docker

cytopia · Oct 27, 2016 · 90ef37f · 90ef37f
1 parent 9b91c4d
commit 90ef37f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ Contributors will be credited within the intranet and on the github page.
   - [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)
-  - [ ] MariaDB 10.0 [#3](https://github.com/cytopia/devilbox/issues/3)
+  - [X] MariaDB 10.0 [#3](https://github.com/cytopia/devilbox/issues/3)
   - [ ] MariaDB 10.2 [#6](https://github.com/cytopia/devilbox/issues/6)
   - [ ] MariaDB 10.2 [#7](https://github.com/cytopia/devilbox/issues/7)
   - [ ] LightHTTPD

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ There is currently a huge annoyance with docker on OSX resulting in very slow fi
 ----
 
 [Usage](https://github.com/cytopia/devilbox#usage) |
-[Video](https://github.com/cytopia/devilbox#watch-usage) |
+[Overview Video](https://github.com/cytopia/devilbox#overview-video) |
 [Run-time Matrix](https://github.com/cytopia/devilbox#run-time-matrix) |
 [Features](https://github.com/cytopia/devilbox#feature-overview) |
 [Intranet](https://github.com/cytopia/devilbox#intranet-overview) |
@@ -47,7 +47,7 @@ $ vim .env
 $ docker-compose up
 ```
 
-## Watch Usage
+## Overview Video
 
 [![Devilbox setup and workflow](https://raw.githubusercontent.com/cytopia/devilbox/master/doc/img/devilbox_player_480.png "devilbox - setup and workflow")](https://www.youtube.com/watch?v=reyZMyt2Zzo)
 
@@ -63,7 +63,7 @@ No need to install and configure different versions locally. Simply choose your
 | [![Build Status](https://travis-ci.org/cytopia/docker-apache-2.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-apache-2.4) [Apache 2.4](https://github.com/cytopia/docker-apache-2.4) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.6) [MySQL 5.6](https://github.com/cytopia/docker-mysql-5.6) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.5) [PHP 5.5](https://github.com/cytopia/docker-php-fpm-5.5) |
 | [![Build Status](https://travis-ci.org/cytopia/docker-nginx-stable.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-stable) [Nginx stable](https://github.com/cytopia/docker-nginx-stable) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.7.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.7) [MySQL 5.7](https://github.com/cytopia/docker-mysql-5.7)  | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.6) [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
 | [![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)  | [![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) |
-|       | MariaDB 10.0 | [![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.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.0) [MariaDB 10.0](https://github.com/cytopia/docker-mariadb-10.0) | [![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) |
 |       | MariaDB 10.1 | |
 |       | MariaDB 10.2 | |
 
@@ -80,6 +80,12 @@ No need to install and configure different versions locally. Simply choose your
 
 
 
+## Documentation
+
+* Configuration
+* Xdebug
+
+
 ## Intranet overview
 
 The devilbox comes with a pre-configured intranet on `http://localhost`

diff --git a/env-example b/env-example
@@ -51,6 +51,7 @@ MYSQL_SERVER=mysql-5.5
 #MYSQL_SERVER=mysql-5.6
 #MYSQL_SERVER=mysql-5.7
 #MYSQL_SERVER=mariadb-5.5
+#MYSQL_SERVER=mariadb-10.0