Separate the PHP versions to multiple dockerfiles

Because there's some difference in installing some libraries
between PHP 5 and PHP 7. There must be multiple php dockerfiles.
For that I created 3 docker files each of a different version,
this will make it easy for the users to switch between the PHP
version by just editing the docker-compose file and not touching
the dockerfiles.

README.md

@@ -1,6 +1,6 @@
 # LaraDock
 
-[![forthebadge](http://forthebadge.com/images/badges/built-with-love.svg)](http://www.zalt.me)
+[![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
 
 
 LaraDock helps you run your **Laravel** App on **Docker** real quick.
@@ -29,13 +29,13 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 	- [Close all running Containers](#Close-all-running-Containers)
 	- [Delete all existing Containers](#Delete-all-existing-Containers)
 	- [Build/Re-build Containers](#Build-Re-build-Containers)
-	- [Use Redis](#Use-Redis)
 	- [Change the PHP Version](#Change-the-PHP-Version)
 	- [Add/Remove a Docker Container](#AddRemove-a-Docker-Container)
 	- [Add more Software's (Docker Images)](#Add-Docker-Images)
 	- [Edit default container configuration](#Edit-Container)
 	- [Use custom Domain](Use-custom-Domain)
 	- [View the Log files](#View-the-Log-files)
+	- [Use Redis](#Use-Redis)
 	- [Enter a Container (SSH into a running Container)](#Enter-Container)
 	- [Edit a Docker Image](#Edit-a-Docker-Image)
 	- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
@@ -52,22 +52,47 @@ LaraDock strives to make the development experience easier.
 It contains pre-packaged Docker Images that provides you a wonderful development environment without requiring you to install PHP, NGINX, MySQL, REDIS, and any other software on your local machine.
 
 
+**Usage Overview:** Run `NGINX`, `MySQL` and `Redis`.
+
+```shell
+docker-compose up -d  nginx mysql redis 
+```
+
 <a name="features"></a>
 ### Features
 
-- Easy switch between PHP versions: 7.0 - 5.6 - 5.5 - ...
-- Choose your favorite database engine: MySQL - Postgres - Redis - ...
-- Run your own combination of software's: PHP - NGINX - MySQL - ...
-- Every software runs on a separate container: PHP - NGINX - ...
+- Easy switch between PHP versions: 7.0 - 5.6 - 5.5 ...
+- Choose your favorite database engine: MySQL - Postgres - Redis ...
+- Run your own combination of software's: Memcached - MariaDB ...
+- Every software runs on a separate container: PHP - NGINX ...
 - Easy to customize any container, with simple edit to the `dockerfile`.
 - All Images extends from an official base Image. (Trusted base Images).
-- Pre-configured Nginx for Laravel. And very easy to update.
-- Using of a Data container, to keep the Data safe and accessible at anytime.
+- Pre-configured Nginx for Laravel.
+- Data container, to keep Data safe and accessible.
 - Easy to apply configurations inside containers.
 - Clean and well structured Dockerfiles (`dockerfile`).
 - Latest version of the Docker Compose file (`docker-compose`).
 - Everything is visible and editable.
-- Best practices everywhere.
+
+
+<a name="Supported-Containers"></a>
+## Supported Containers
+
+- PHP (7.0 - 5.6 - 5.5)
+- NGINX
+- MySQL
+- PostgreSQL
+- MariaDB
+- Redis
+- Memcached
+- Beanstalkd
+- Beanstalkd Console
+- Data Volume
+
+>Cannot find your container! we would love to have it as well. Consider contributing your container and adding it to this list.
+
+
+
 
 
 <a name="what-is-docker"></a>
@@ -105,18 +130,6 @@ LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both gives y
 Running a virtual Container is much faster than running a full virtual Machine. 
 <br>Thus **LaraDock is much faster than Homestead**.
 
-<a name="Supported-Containers"></a>
-## Supported Containers
-
-- PHP (7.0 - 5.6 - 5.5)
-- NGINX
-- MySQL
-- PostgreSQL
-- Redis
-- Data Volume
-
-Cannot find your container! we would love to have it as well. Consider contributing your container and adding it to this list.
-
 
 
 <a name="Requirements"></a>
@@ -139,7 +152,7 @@ Cannot find your container! we would love to have it as well. Consider contribut
 git clone https://github.com/LaraDock/laradock.git docker
 ```
 
-Instead of `git clone` you can use `git submodule add` in case you are already using Git for your Laravel project *(Recommended)*:
+You can use `git submodule add` instead of `git clone` if you are already using Git for your Laravel project *(Recommended)*:
 
 ```bash
 git submodule add https://github.com/LaraDock/laradock.git docker
@@ -154,7 +167,7 @@ git submodule add https://github.com/LaraDock/laradock.git docker
 ## Usage
 
 0 - For **Windows & MAC** users only: make sure you have a running Docker Virtual Host on your machine. 
-(**Linux** users don't need a Virtual Host, so skip this step)
+(**Linux** users don't need a Virtual Host, so skip this step).
 <br>
 [How to run a Docker Virtual Host?](#Run-Docker-Virtual-Host)
 
@@ -172,21 +185,21 @@ DB_HOST=xxx.xxx.xxx.xxx
 <br>
 *Make sure you are in the `docker` folder before running the `docker-compose` command.*
 
-> Running PHP, NGINX and MySQL:
+> Running PHP, NGINX, MySQL and Redis:
 
 ```bash
-docker-compose up -d   php nginx mysql
+docker-compose up -d  php nginx mysql redis
 ```
 
 Note: you can choose your own combination of software's (containers), another example:
 
-> Running PHP, NGINX, Postgres and Redis:
+> Running PHP, NGINX, Postgres and Memcached:
 
 ```bash
-docker-compose up -d   php nginx postgres redis
+docker-compose up -d  php nginx postgres memcached
 ```
 
-Supported Containers: `php`, `nginx`, `mysql`, `postgres`, `redis`, `data`.
+Supported Containers: `nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `memcached`, `beanstalkd`, `beanstalkd-console`, `data`, `php`.
 
 <br>
 3 - Open your browser and visit your `{Docker-IP}` address (`http://xxx.xxx.xxx.xxx`).
@@ -260,50 +273,6 @@ docker-compose build {container-name}
 ```
 
 
-<br>
-<a name="Use-Redis"></a>
-#### Use Redis
-
-1 - First make sure you run the Redis Container with the `docker-compose` command.
-
-2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to your `Docker-IP` instead of the default `127.0.0.1` IP.
-
-```env
-REDIS_HOST=xxx.xxx.xxx.xxx
-```
-
-If you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database config file `config/database.php` and replace the default `127.0.0.1` IP with your `Docker-IP` for Redis like this:
-
-```php
-'redis' => [
-    'cluster' => false,
-    'default' => [
-        'host'     => 'xxx.xxx.xxx.xxx',
-        'port'     => 6379,
-        'database' => 0,
-    ],
-],
-```
-
-3 - To enable Redis Caching and/or for Sessions Management. Also from the `.env` file set `CACHE_DRIVER` and `SESSION_DRIVER` to `redis` instead of the default `file`.
-
-```env
-CACHE_DRIVER=redis
-SESSION_DRIVER=redis
-```
-
-4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer first.
-
-```bash
-composer require predis/predis:^1.0
-```
-
-5 - You can manually test it from Laravel with this code:
-
-```php
-\Cache::store('redis')->put('LaraDock', 'Awesome', 10);
-```
-
 
 
 <br>
@@ -313,28 +282,38 @@ By default **PHP 7.0** is running.
 <br>
 To change the default PHP version:
 
-1 - Open the `dockerfile` of the `php` folder.
+1 - Open the `docker-compose.yml`.
 
-2 - Change the PHP version number in the first line,
+2 - Search for `Dockerfile-php-70` in the PHP container section.
+
+3 - Change the version number. 
+<br>
+Example to select version 5.6 instead of 7.0 you have to replace `Dockerfile-php-70` with `Dockerfile-php-56`.
+
+Sample: 
 
 ```txt
-FROM php:7.0-fpm
+php:
+    build:
+        context: ./php
+        dockerfile: Dockerfile-php-70
 ```
 
 Supported Versions:
 
-- For (PHP 7.0.*) use `php:7.0-fpm`
-- For (PHP 5.6.*) use `php:5.6-fpm`
-- For (PHP 5.5.*) use `php:5.5-fpm`
+- For (PHP 7.0.*) use `Dockerfile-php-70`
+- For (PHP 5.6.*) use `Dockerfile-php-56`
+- For (PHP 5.5.*) use `Dockerfile-php-55`
 
-For more details visit the [official PHP docker images](https://hub.docker.com/_/php/).
 
-3 - Finally rebuild the container
+4 - Finally rebuild the container
 
 ```bash
 docker-compose build php
 ```
 
+For more details visit the [official PHP docker images](https://hub.docker.com/_/php/).
+
 
 <br>
 <a name="Add-Docker-Images"></a>
@@ -408,26 +387,67 @@ The Log files are stored in the `docker/logs` directory.
 
 
 
+
+<br>
+<a name="Use-Redis"></a>
+#### Use Redis
+
+1 - First make sure you run the Redis Container with the `docker-compose` command.
+
+2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to your `Docker-IP` instead of the default `127.0.0.1` IP.
+
+```env
+REDIS_HOST=xxx.xxx.xxx.xxx
+```
+
+If you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database config file `config/database.php` and replace the default `127.0.0.1` IP with your `Docker-IP` for Redis like this:
+
+```php
+'redis' => [
+    'cluster' => false,
+    'default' => [
+        'host'     => 'xxx.xxx.xxx.xxx',
+        'port'     => 6379,
+        'database' => 0,
+    ],
+],
+```
+
+3 - To enable Redis Caching and/or for Sessions Management. Also from the `.env` file set `CACHE_DRIVER` and `SESSION_DRIVER` to `redis` instead of the default `file`.
+
+```env
+CACHE_DRIVER=redis
+SESSION_DRIVER=redis
+```
+
+4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer first.
+
+```bash
+composer require predis/predis:^1.0
+```
+
+5 - You can manually test it from Laravel with this code:
+
+```php
+\Cache::store('redis')->put('LaraDock', 'Awesome', 10);
+```
+
+
+
+
+
 <br>
 <a name="Enter-Container"></a>
 #### Enter a Container (SSH into a running Container)
 
 1 - first list the current running containers with `docker ps`
 
-2 - enter any container with:
-
-Example: enter the `php` container
+2 - enter any container using:
 
 ```bash
-docker exec -it php bash
+docker exec -it {container-name-or-id} bash
 ```
-
-Example: enter the `nginx` container
-
-```bash
-docker exec -it nginx bash
-```
-
+3 - to exit a container, type `exit`.
 
 
 <br>

beanstalkd-console/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+RUN apt-get update && apt-get install -y curl
+
+RUN curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /tmp
+RUN mv /tmp/beanstalk_console-master /source
+
+RUN apt-get remove --purge -y curl && apt-get autoclean && apt-get clean
+RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+EXPOSE 2080
+
+CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'

beanstalkd/Dockerfile

@@ -0,0 +1,16 @@
+FROM phusion/baseimage:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+RUN apt-get update
+RUN apt-get install -y beanstalkd
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+VOLUME /var/lib/beanstalkd/data
+
+EXPOSE 11300
+
+CMD ["/usr/bin/beanstalkd"]

docker-compose.yml

@@ -1,4 +1,5 @@
 version: '2'
+
 services:
 
 ### Nginx Server Container ##################################
@@ -17,7 +18,9 @@ services:
 ### PHP Container ###########################################
 
     php:
-        build: ./php
+        build:
+            context: ./php
+            dockerfile: Dockerfile-php-70
         volumes:
             - ../:/var/www/laravel
             - ./logs/php/:/usr/local/var/log
@@ -30,8 +33,10 @@ services:
         build: ./data
         volumes:
             - /var/lib/mysql
-            - /var/lib/postgresql/data
+            - /var/lib/postgres
+            - /var/lib/mariadb
             - /var/lib/redis
+            - /var/lib/memcached
 
 ### MySQL Container #########################################
 
@@ -64,6 +69,22 @@ services:
         links:
             - php
 
+### MariaDB Container #######################################
+
+    mariadb:  
+        build: ./mariadb
+        volumes_from:
+            - data
+        ports:
+            - "3306:3306"
+        environment:
+            MYSQL_DATABASE: homestead
+            MYSQL_USER: homestead
+            MYSQL_PASSWORD: secret
+            MYSQL_ROOT_PASSWORD: root
+        links:
+            - php
+
 ### Redis Container #########################################
 
     redis:
@@ -72,5 +93,37 @@ services:
             - data
         ports:
             - "6379:6379"
+        links:
+            - php
+
+### Memcached Container #####################################
+
+    memcached:
+        build: ./memcached
+        volumes_from:
+            - data
+        ports:
+            - "11211:11211"
+        links:
+            - php
+
+### Beanstalkd Container ####################################
+
+    beanstalkd:
+        build: ./beanstalkd
+        ports:
+            - "11300:11300"
+        privileged: true
+        links:
+            - php
+
+### Beanstalkd-Console Container ############################
+
+    beanstalkd-console:
+        build: ./beanstalkd-console
+        ports:
+            - "2080:2080"
+        links:
+            - beanstalkd
 
 ### Add more Containers below ###############################

mariadb/Dockerfile

@@ -0,0 +1,7 @@
+FROM mariadb:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["mysqld"]
+
+EXPOSE 3306

memcached/Dockerfile

@@ -0,0 +1,7 @@
+FROM memcached:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["memcached"]
+
+EXPOSE 11211

mysql/Dockerfile

@@ -2,8 +2,6 @@ FROM mysql:latest
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-VOLUME /var/lib/mysql
-
 CMD ["mysqld"]
 
 EXPOSE 3306

php/Dockerfile-php-55

@@ -1,16 +1,23 @@
-FROM php:7.0-fpm
+FROM php:5.5-fpm
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 ADD ./laravel.ini /usr/local/etc/php/conf.d
 ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 
+RUN apt-get update && apt-get install \
+    libpq-dev -y \
+    curl
+
 # Install extensions using the helper script provided by the base image
 RUN docker-php-ext-install \
-    pdo_mysql
+    pdo_mysql \
+    pdo_pgsql
 
 RUN usermod -u 1000 www-data
 
+WORKDIR /var/www/laravel
+
 CMD ["php-fpm"]
 
 EXPOSE 9000

php/Dockerfile-php-56

@@ -0,0 +1,23 @@
+FROM php:5.6-fpm
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
+RUN apt-get update && apt-get install \
+    libpq-dev -y \
+    curl
+
+# Install extensions using the helper script provided by the base image
+RUN docker-php-ext-install \
+    pdo_mysql \
+    pdo_pgsql
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php/Dockerfile-php-70

@@ -0,0 +1,32 @@
+FROM php:7.0-fpm
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
+RUN apt-get update && apt-get install \
+	libpq-dev -y \
+    curl \
+    libmemcached-dev
+
+# Install extensions using the helper script provided by the base image
+RUN docker-php-ext-install \
+    pdo_mysql \
+    pdo_pgsql
+
+# Install Memcached for php 7
+RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz" \
+    && mkdir -p /usr/src/php/ext/memcached \
+    && tar -C /usr/src/php/ext/memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
+    && docker-php-ext-configure memcached \
+    && docker-php-ext-install memcached \
+    && rm /tmp/memcached.tar.gz
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

postgres/Dockerfile

@@ -2,8 +2,6 @@ FROM postgres:latest
 
 MAINTAINER Ben M <git@bmagg.com>
 
-VOLUME /var/lib/postgresql/data
-
 CMD ["postgres"]
 
 EXPOSE 5432