Merge branch 'master' of https://github.com/LaraDock/laradock

* 'master' of https://github.com/LaraDock/laradock:

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*]
+charset = utf-8
+
+[{Dockerfile,docker-compose.yml}]
+indent_style = space
+indent_size = 4

.env

@@ -1 +0,0 @@
-INSTALL_PRESTISSIMO=false

README.md

@@ -2,6 +2,7 @@
 
 [![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
 
+[![Gitter](https://badges.gitter.im/LaraDock/laradock.svg)](https://gitter.im/LaraDock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 LaraDock helps you run your **Laravel** App on **Docker** real quick.
 <br>
@@ -9,7 +10,8 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 
 >With LaraDock, use Docker first and learn about it later.
 
-![](http://s18.postimg.org/fhykchl09/new_laradock_cover.png)
+
+![](https://s31.postimg.org/nbettdki3/lara_dock_poster_new.jpg)
 
 <br>
 ## Contents
@@ -46,11 +48,14 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Install PHP Extensions](#Install-PHP-Extensions)
 		- [Change the PHP-FPM Version](#Change-the-PHP-FPM-Version)
 		- [Change the PHP-CLI Version](#Change-the-PHP-CLI-Version)
+		- [Install xDebug](#Install-xDebug)
 	- [Misc](#Misc)
 		- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
 		- [Find your Docker IP Address](#Find-Docker-IP-Address)
 		- [Use custom Domain](#Use-custom-Domain)
+		- [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install)
 		- [Install Prestissimo](#Install-Prestissimo)
+		- [Install Node + NVM](#Install-Node)
 		- [Debugging](#debugging)
 - [Help & Questions](#Help)
 
@@ -72,37 +77,38 @@ docker-compose up  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: Memcached - MariaDB ...
-- Every software runs on a separate container: PHP-FPM - NGINX ...
+- Easy switch between PHP versions: 7.0, 5.6, 5.5...
+- Choose your favorite database engine: MySQL, Postgres, MariaDB...
+- Run your own combination of software's: Memcached, HHVM, Beanstalkd...
+- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
 - 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.
-- 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.
+- Fast Images Builds.
+- More to come every week..
 
 
 <a name="Supported-Containers"></a>
 ### Supported Containers
 
-- PHP-FPM (7.0 - 5.6 - 5.5)
+- PHP-FPM
 - NGINX
+- HHVM
 - MySQL
 - PostgreSQL
 - MariaDB
-- Neo4j
 - MongoDB
+- Neo4j
 - Redis
 - Memcached
+- Caddy
 - Beanstalkd
 - Beanstalkd Console
-- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite,  Vim, Nano, cURL and much more)
-- Data *(Databases Data Container)*
-- Application *(Application Code Container)*
+- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, SQLite,  Vim, Nano, cURL...)
 
 
 >If you can't find your container, build it yourself and add it to this list. Contributions are welcomed :)
@@ -166,7 +172,7 @@ What's better than a [**Demo Video**](https://www.youtube.com/watch?v=-DamFMczwD
 ## Installation
 
 
-1 - Clone the `LaraDock` repository.
+1 - Clone the `LaraDock` repository:
 
 **A)** If you already have a Laravel project, clone this repository on your `Laravel` root direcotry:
 
@@ -205,10 +211,10 @@ docker-compose up -d  nginx mysql
 
 You can select your own combination of container form this list:
 
-`nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `data`, `php-fpm`, `application`.
+`nginx`, `hhvm` ,`mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `caddy`, `workspace`, `php-fpm`.
 
 
-**Note**: `workspace`, `data`, `php-fpm` and `application` will run automatically in most of the cases.
+**Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command.
 
 
 
@@ -572,14 +578,47 @@ composer require predis/predis:^1.0
 <a name="Use-Mongo"></a>
 ### Use Mongo
 
-1 - First make sure you run the MongoDB Container (`mongo`) with the `docker-compose up` command.
+1 - First install `mongo` in the Workspace and the PHP-FPM Containers: 
+<br>
+a) open the `docker-compose.yml` file
+<br>
+b) search for the `INSTALL_MONGO` argument under the Workspace Container 
+<br>
+c) set it to `true`
+<br>
+d) search for the `INSTALL_MONGO` argument under the PHP-FPM Container 
+<br>
+e) set it to `true`
+
+It should be like this:
+
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_MONGO=true
+    ...
+    php-fpm:
+        build:
+            context: ./php-fpm
+            args:
+                - INSTALL_MONGO=true
+    ...
+```
+
+2 - Re-build the containers `docker-compose build workspace php-fpm`
+
+
+
+3 - Run the MongoDB Container (`mongo`) with the `docker-compose up` command.
 
 ```bash
 docker-compose up -d mongo
 ```
 
 
-2 - Add the MongoDB configurations to the `config/database.php` config file:
+4 - Add the MongoDB configurations to the `config/database.php` config file:
 
 ```php
 'connections' => [
@@ -601,21 +640,21 @@ docker-compose up -d mongo
 ],
 ```
 
-3 - Open your Laravel's `.env` file and update the following variables:
+5 - Open your Laravel's `.env` file and update the following variables:
 
 - set the `DB_HOST` to your `Docker-IP`.
 - set the `DB_PORT` to `27017`.
 - set the `DB_DATABASE` to `database`.
 
 
-4 - Finally make sure you have the `jenssegers/mongodb` package installed via Composer and its Service Provider is added.
+6 - Finally make sure you have the `jenssegers/mongodb` package installed via Composer and its Service Provider is added.
 
 ```bash
 composer require jenssegers/mongodb
 ```
 More details about this [here](https://github.com/jenssegers/laravel-mongodb#installation).
 
-5 - Test it:
+7 - Test it:
 
 - First let your Models extend from the Mongo Eloquent Model. Check the [documentation](https://github.com/jenssegers/laravel-mongodb#eloquent).
 - Enter the Workspace Container `docker exec -it laradock_workspace_1 bash`.
@@ -654,20 +693,18 @@ The PHP-CLI extensions should be installed in `workspace/Dockerfile`.
 
 <br>
 <a name="Change-the-PHP-FPM-Version"></a>
-### Change the PHP-FPM Version
+### Change the (PHP-FPM) Version
 By default **PHP-FPM 7.0** is running.
 
 >The PHP-FPM is responsible of serving your application code, you don't have to change the PHP-CLI version if you are planing to run your application on different PHP-FPM version.
 
+#### A) Switch from PHP `7.0` to PHP `5.6`
+
 1 - Open the `docker-compose.yml`.
 
 2 - Search for `Dockerfile-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-70` with `Dockerfile-56`.
-
-Sample:
+3 - Change the version number, by replacing `Dockerfile-70` with `Dockerfile-56`, like this:
 
 ```txt
 php-fpm:
@@ -676,20 +713,33 @@ php-fpm:
         dockerfile: Dockerfile-70
 ```
 
-Supported Versions:
-
-- For (PHP 7.0.*) use `Dockerfile-70`
-- For (PHP 5.6.*) use `Dockerfile-56`
-- For (PHP 5.5.*) use `Dockerfile-55`
-
-
 4 - Finally rebuild the container
 
 ```bash
 docker-compose build php
 ```
 
-For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
+> For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
+
+
+#### B) Switch from PHP `7.0` or `5.6` to PHP `5.5`
+
+We do not natively support PHP 5.5 anymore, but you can get it in few steps:
+
+1 - Clone `https://github.com/LaraDock/php-fpm`.
+
+3 - Rename `Dockerfile-56` to `Dockerfile-55`.
+
+3 - Edit the file `FROM php:5.6-fpm` to `FROM php:5.5-fpm`.
+
+4 - Build an image from `Dockerfile-55`.
+
+5 - Open the `docker-compose.yml` file.
+
+6 - Point `php-fpm` to your `Dockerfile-55` file.
+
+
+
 
 
 
@@ -713,10 +763,40 @@ Right now you have to manually edit the `Dockerfile` or create a new one like it
 
 
 
+<br>
+<a name="Install-xDebug"></a>
+### Install xDebug
 
+1 - First install `xDebug` in the Workspace and the PHP-FPM Containers: 
+<br>
+a) open the `docker-compose.yml` file
+<br>
+b) search for the `INSTALL_XDEBUG` argument under the Workspace Container 
+<br>
+c) set it to `true`
+<br>
+d) search for the `INSTALL_XDEBUG` argument under the PHP-FPM Container 
+<br>
+e) set it to `true`
 
+It should be like this:
 
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_XDEBUG=true
+    ...
+    php-fpm:
+        build:
+            context: ./php-fpm
+            args:
+                - INSTALL_XDEBUG=true
+    ...
+```
 
+2 - Re-build the containers `docker-compose build workspace php-fpm`
 
 
 
@@ -820,11 +900,77 @@ server_name laravel.dev;
 ```
 
 
+
+<br>
+<a name="Enable-Global-Composer-Build-Install"></a>
+### Enable Global Composer Build Install
+
+Enabling Global Composer Install during the build for the container allows you to get your composer requirements installed and available in the container after the build is done.
+
+1 - open the `docker-compose.yml` file
+
+2 - search for the `COMPOSER_GLOBAL_INSTALL` argument under the Workspace Container and set it to `true`
+
+It should be like this:
+
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - COMPOSER_GLOBAL_INSTALL=true
+    ...
+```
+3 - now add your dependencies to `workspace/composer.json`
+
+4 - rebuild the Workspace Container `docker-compose build workspace`
+
+
+
+
 <br>
 <a name="Install-Prestissimo"></a>
 ### Install Prestissimo
 
-[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality. You can enable Prestissimo by setting `INSTALL_PRESTISSIMO=true` in the `docker-compose.yml` file.
+[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality. 
+
+1 - Enable Running Global Composer Install during the Build:
+
+Click on this [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install) and do steps 1 and 2 only then continue here.
+
+2 - Add prestissimo as requirement in Composer:
+
+a - now open the `workspace/composer.json` file
+
+b - add `"hirak/prestissimo": "^0.3"` as requirement
+
+c - rebuild the Workspace Container `docker-compose build workspace`
+
+
+
+
+<br>
+<a name="Install-Node"></a>
+### Install Node + NVM
+
+To install NVM and NodeJS in the Workspace container
+
+1 - Open the `docker-compose.yml` file
+
+2 - Search for the `INSTALL_NODE` argument under the Workspace Container and set it to `true`
+
+It should be like this:
+
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_NODE=true
+    ...
+```
+
+3 - Re-build the container `docker-compose build workspace`
 
 <br>
 <a name="debugging"></a>
@@ -858,12 +1004,11 @@ This little project was built by one man who has a full time job and many respon
 <a name="Help"></a>
 ## Help & Questions
 
-If you need any help with Docker and Laravel, you can schedule a live call with the creator of this project at [Codementor.io](https://www.codementor.io/mahmoudz), He would love to help.
+Join the chat room on [Gitter](https://gitter.im/LaraDock/laradock) and get help and support from the community. 
 
-For general questions you can open [Issues](https://github.com/laradock/laradock/issues) here on Github (We will label them as questions).
-
-Additionally, you can contact Mahmoud Zalt (the creator of this project) via a direct message on LaraChat, (his username is `mahmoud_zalt`). Or send him an email (`mahmoud@zalt.me`).
+You can as well can open an [issue](https://github.com/laradock/laradock/issues) on Github (will be labeled as Question) and discuss it with people on [Gitter](https://gitter.im/LaraDock/laradock).
 
+For special help with Docker and/or Laravel, you can schedule a live call with the creator of this project at [Codementor.io](https://www.codementor.io/mahmoudz).
 
 ## Credits
 
@@ -873,10 +1018,13 @@ Additionally, you can contact Mahmoud Zalt (the creator of this project) via a d
 
 **Main Contributors:**
 
-- [Jack Fletcher](https://github.com/Kauhat)
-- [Bo-Yi Wu](https://github.com/appleboy)
-- [Amin Mkh](https://github.com/AminMkh)
-- [Matthew Tonkin Dunn](https://github.com/mattythebatty)
+- [Eric Pfeiffer (computerfr33k)](https://github.com/computerfr33k)
+- [Orette](https://github.com/orette)
+- [Jack Fletcher (Kauhat)](https://github.com/Kauhat)
+- [Bo-Yi Wu (appleboy)](https://github.com/appleboy)
+- [Amin Mkh (AminMkh)](https://github.com/AminMkh)
+- [Matthew Tonkin Dunn (mattythebatty)](https://github.com/mattythebatty)
+- [Zhivitsa Kirill (zhikiri)](https://github.com/zhikiri)
 - [Benmag](https://github.com/benmag)
 
 **Awesome People:**

beanstalkd-console/Dockerfile

@@ -7,9 +7,11 @@ 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/*
+RUN apt-get remove --purge -y curl &&
+    apt-get autoclean &&
+    apt-get clean &&
+    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'
+CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'

caddy/Caddyfile

@@ -0,0 +1,17 @@
+# Docs: https://caddyserver.com/docs/caddyfile
+0.0.0.0:80
+root /var/www/laravel/public
+fastcgi / php-fpm:9000 php {
+    index index.php
+}
+rewrite {
+    r .*
+    ext /
+    to /index.php?{query}
+}
+browse
+log stdout
+errors stderr
+# Uncomment to enable TLS (HTTPS)
+# Change the first list to listen on port 443 when enabling TLS
+#tls self_signed

caddy/Dockerfile

@@ -0,0 +1,25 @@
+FROM alpine:3.4
+
+MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
+
+LABEL caddy_version="0.9.0" architecture="amd64"
+
+RUN apk update \
+    && apk upgrade \
+    && apk add tar curl
+
+RUN curl --silent --show-error --fail --location \
+      --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
+      "https://github.com/mholt/caddy/releases/download/v0.9.0/caddy_linux_amd64.tar.gz" \
+    | tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
+ && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
+ && chmod 0755 /usr/bin/caddy \
+ && /usr/bin/caddy -version
+
+EXPOSE 80 443 2015
+
+WORKDIR /var/www/laravel/public
+
+ENTRYPOINT ["caddy"]
+
+CMD ["-conf", "/etc/Caddyfile"]

docker-compose.yml

@@ -2,10 +2,43 @@ version: '2'
 
 services:
 
+### Workspace Utilities Container ###########################
+
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_MONGO=false
+                - INSTALL_XDEBUG=false
+                - INSTALL_NODE=false
+                - COMPOSER_GLOBAL_INSTALL=false
+        volumes_from:
+            - volumes_source
+        tty: true
+
+### PHP-FPM Container #######################################
+
+    php-fpm:
+        build:
+            context: ./php-fpm
+            args:
+                - INSTALL_MONGO=false
+                - INSTALL_XDEBUG=false
+            dockerfile: Dockerfile-70
+        volumes_from:
+            - volumes_source
+        expose:
+            - "9000"
+        links:
+            - workspace
+
 ### Nginx Server Container ##################################
 
     nginx:
-        build: ./nginx
+        build:
+            context: ./nginx
+            args:
+                - PHP_UPSTREAM=php-fpm
         volumes_from:
             - volumes_source
         volumes:
@@ -16,12 +49,10 @@ services:
         links:
             - php-fpm
 
-### PHP-FPM Container #######################################
+### HHVM Container ##########################################
 
-    php-fpm:
-        build:
-            context: ./php-fpm
-            dockerfile: Dockerfile-70
+    hhvm:
+        build: ./hhvm
         volumes_from:
             - volumes_source
         expose:
@@ -130,16 +161,20 @@ services:
         links:
             - beanstalkd
 
-### Workspace Utilities Container ###########################
+### Caddy Server Container ##################################
 
-    workspace:
-        build:
-            context: ./workspace
-            args:
-                - INSTALL_PRESTISSIMO=false
+    caddy:
+        build: ./caddy
         volumes_from:
             - volumes_source
-        tty: true
+        ports:
+            - "80:80"
+            - "443:443"
+            - "2015:2015"
+        volumes:
+            - ./caddy/Caddyfile:/etc/Caddyfile
+        links:
+            - php-fpm
 
 ### Laravel Application Code Container ######################
 

hhvm/Dockerfile

@@ -0,0 +1,23 @@
+FROM ubuntu:14.04  
+
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
+
+RUN apt-get update -y \
+    && apt-get install -y software-properties-common \
+    && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \
+    && apt-get update -y \
+    && apt-get install -y hhvm \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /var/www/laravel
+
+ADD server.ini /etc/hhvm/server.ini
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["/usr/bin/hhvm", "-m", "server", "-c", "/etc/hhvm/server.ini"]
+
+EXPOSE 9000

hhvm/server.ini

@@ -0,0 +1,20 @@
+; php options
+
+pid = /var/run/hhvm/pid
+
+; hhvm specific
+hhvm.server.port = 9000
+hhvm.server.type = fastcgi
+hhvm.server.default_document = index.php
+hhvm.server.error_document404 = index.php
+hhvm.server.upload.upload_max_file_size = 25M
+hhvm.log.level = Error
+hhvm.log.header = true
+hhvm.log.access[default][file] = /var/log/hhvm/access.log
+hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b"
+hhvm.server.source_root=/var/www/laravel/public
+hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
+
+; Uncomment to log to files instead of STDOUT
+;hhvm.log.use_log_file = true
+;hhvm.log.file = /var/log/hhvm/error.log

nginx/Dockerfile

@@ -1,13 +1,18 @@
-FROM nginx:latest
+FROM nginx:alpine
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 ADD nginx.conf /etc/nginx/
-ADD laravel.conf /etc/nginx/sites-available/
+ADD laravel.conf /etc/nginx/conf.d/laravel.conf
 
-RUN echo "upstream php-upstream { server php-fpm:9000; }" > /etc/nginx/conf.d/upstream.conf
+ARG PHP_UPSTREAM=php-fpm
 
-RUN usermod -u 1000 www-data
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache bash \
+    && adduser -D -H -u 1000 -s /bin/bash www-data \
+    && rm /etc/nginx/conf.d/default.conf \
+    && echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
 
 CMD ["nginx"]
 

nginx/nginx.conf

@@ -1,6 +1,7 @@
 user www-data;
 worker_processes 4;
 pid /run/nginx.pid;
+daemon off;
 
 events {
   worker_connections  2048;
@@ -18,13 +19,10 @@ http {
   client_max_body_size 20M;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log on;
-  error_log on;
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;
-  include /etc/nginx/sites-available/*;
   open_file_cache max=100;
 }
-
-daemon off;

php-fpm/Dockerfile-55

@@ -1,52 +0,0 @@
-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 -y \
-    libpq-dev \
-    libmemcached-dev \
-    curl \
-    libjpeg-dev \
-    libpng12-dev \
-    libfreetype6-dev \
-    libssl-dev \
-    libmcrypt-dev \
-    --no-install-recommends \
-    && rm -r /var/lib/apt/lists/*
-
-# install mcrypt library
-RUN docker-php-ext-install mcrypt
-
-# Install mongodb driver
-RUN pecl install mongodb
-
-# configure gd library
-RUN docker-php-ext-configure gd \
-    --enable-gd-native-ttf \
-    --with-jpeg-dir=/usr/lib \
-    --with-freetype-dir=/usr/include/freetype2
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql \
-    gd
-
-# Install memcached
-RUN pecl install memcached \
-    && docker-php-ext-enable memcached
-
-# Install xdebug
-RUN pecl install xdebug \
-    && docker-php-ext-enable xdebug
-
-RUN usermod -u 1000 www-data
-
-WORKDIR /var/www/laravel
-
-CMD ["php-fpm"]
-
-EXPOSE 9000

php-fpm/Dockerfile-56

@@ -1,47 +1,69 @@
-FROM php:5.6-fpm
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+FROM laradock/php-fpm:5.6--1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
+# are installed on the base image 'laradock/php-fpm' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/php-fpm).
+#
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
+#
+
+#####################################
+# xDebug:
+#####################################
+
+ARG INSTALL_XDEBUG=true
+ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    # Install the xdebug extention
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug \
+;fi
+
+#####################################
+# MongoDB:
+#####################################
+
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extention
+    pecl install mongodb \
+;fi
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
 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 -y \
-    libpq-dev \
-    libmemcached-dev \
-    curl \
-    libjpeg-dev \
-    libpng12-dev \
-    libfreetype6-dev \
-    libssl-dev \
-    libmcrypt-dev \
-    --no-install-recommends \
-    && rm -r /var/lib/apt/lists/*
-
-# install mcrypt library
-RUN docker-php-ext-install mcrypt
-
-# Install mongodb driver
-RUN pecl install mongodb
-
-# configure gd library
-RUN docker-php-ext-configure gd \
-    --enable-gd-native-ttf \
-    --with-jpeg-dir=/usr/lib \
-    --with-freetype-dir=/usr/include/freetype2
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql \
-    gd
-
-# Install memcached
-RUN pecl install memcached \
-    && docker-php-ext-enable memcached
-
-# Install xdebug
-RUN pecl install xdebug \
-    && docker-php-ext-enable xdebug
+RUN rm -r /var/lib/apt/lists/*
 
 RUN usermod -u 1000 www-data
 

php-fpm/Dockerfile-70

@@ -1,51 +1,69 @@
-FROM php:7.0-fpm
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+FROM laradock/php-fpm:7.0--1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
+# are installed on the base image 'laradock/php-fpm' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/php-fpm).
+#
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
+#
+
+#####################################
+# xDebug:
+#####################################
+
+ARG INSTALL_XDEBUG=true
+ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    # Install the xdebug extention
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug \
+;fi
+
+#####################################
+# MongoDB:
+#####################################
+
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extention
+    pecl install mongodb \
+;fi
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
 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 -y \
-    libpq-dev \
-    libmemcached-dev \
-    curl \
-    libjpeg-dev \
-    libpng12-dev \
-    libfreetype6-dev \
-    libssl-dev \
-    libmcrypt-dev \
-    --no-install-recommends \
-    && rm -r /var/lib/apt/lists/*
-
-# install mcrypt library
-RUN docker-php-ext-install mcrypt
-
-# Install mongodb driver
-RUN pecl install mongodb
-
-# configure gd library
-RUN docker-php-ext-configure gd \
-    --enable-gd-native-ttf \
-    --with-jpeg-dir=/usr/lib \
-    --with-freetype-dir=/usr/include/freetype2
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql \
-    gd
-
-# 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
-
-# Install xdebug
-RUN pecl install xdebug \
-    && docker-php-ext-enable xdebug
+RUN rm -r /var/lib/apt/lists/*
 
 RUN usermod -u 1000 www-data
 

workspace/Dockerfile

@@ -1,96 +1,113 @@
-FROM phusion/baseimage:latest
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+FROM laradock/workspace:1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-RUN DEBIAN_FRONTEND=noninteractive
-RUN locale-gen en_US.UTF-8
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("php7.0-cli", "git", "vim", ....) are
+# installed on the base image 'laradock/workspace' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/workspace).
+#
 
-ENV LANGUAGE=en_US.UTF-8
-ENV LC_ALL=en_US.UTF-8
-ENV LC_CTYPE=UTF-8
-ENV LANG=en_US.UTF-8
-ENV TERM xterm
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
+#   - COMPOSER_GLOBAL_INSTALL=  false
+#   - INSTALL_NODE=             false
+#
 
-# Install "software-properties-common" (for the "add-apt-repository")
-RUN apt-get update && apt-get install -y \
-    software-properties-common
+#####################################
+# xDebug:
+#####################################
 
-# Add the "PHP 7" ppa
-RUN add-apt-repository -y \
-    ppa:ondrej/php
+# Check if xDebug needs to be installed
+ARG INSTALL_XDEBUG=true
+ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    # Load the xdebug extension only with phpunit commands
+    apt-get install -y --force-yes php7.0-xdebug && \
+    sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini && \
+    echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \
+;fi
 
-# Install PHP-CLI 7, some PHP extentions and some useful Tools with APT
-RUN apt-get update && apt-get install -y --force-yes \
-        php7.0-cli \
-        php7.0-common \
-        php7.0-curl \
-        php7.0-json \
-        php7.0-xml \
-        php7.0-mbstring \
-        php7.0-mcrypt \
-        php7.0-mysql \
-        php7.0-pgsql \
-        php7.0-sqlite \
-        php7.0-sqlite3 \
-        php7.0-zip \
-        php7.0-memcached \
-        php7.0-gd \
-        php7.0-xdebug \
-        php-dev \
-        libcurl4-openssl-dev \
-        libedit-dev \
-        libssl-dev \
-        libxml2-dev \
-        xz-utils \
-        sqlite3 \
-        libsqlite3-dev \
-        git \
-        curl \
-        vim \
-        nano
+#####################################
+# MongoDB:
+#####################################
 
-# Clean up, to free some space
-RUN apt-get clean
+# Check if Mongo needs to be installed
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extension
+    pecl install mongodb && \
+    echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini \
+;fi
 
-# remove load xdebug extension (only load on phpunit command)
-RUN sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini
+#####################################
+# Composer:
+#####################################
 
-# Add bin folder of composer to PATH.
-RUN echo "export PATH=${PATH}:/var/www/laravel/vendor/bin" >> ~/.bashrc
+# Add the composer.json
+ADD ./composer.json /root/.composer/composer.json
 
-# Install Composer
-RUN curl -s http://getcomposer.org/installer | php \
-    && mv composer.phar /usr/local/bin/composer
+# Check if global install need to be runned
+ARG COMPOSER_GLOBAL_INSTALL=true
+ENV COMPOSER_GLOBAL_INSTALL ${COMPOSER_GLOBAL_INSTALL}
+RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
+    # run the install
+    composer global install \
+;fi
 
-# Load xdebug Zend extension with phpunit command
-RUN echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc
+#####################################
+# Node / NVM:
+#####################################
 
-# Install mongodb extension
-RUN pecl install mongodb
-RUN echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini
+# Check if NVM needs to be installed
+ARG INSTALL_NODE=true
+ENV INSTALL_NODE ${INSTALL_NODE}
+RUN if [ ${INSTALL_NODE} = true ]; then \
+    # Install nvm (A Node Version Manager)
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash \
+;fi
+# Again check if NVM needs to be installed
+# I had to split this condifiton link this because when I get it inside the above if statment is refuses to work!
+ENV if [ ${INSTALL_NODE} = true ]; then \
+    # Set the ENV
+    NVM_DIR=/root/.nvm \
+    # Install NodeJS with NVM
+    RUN . ~/.nvm/nvm.sh && \
+        nvm install stable && \
+        nvm use stable && \
+        nvm alias stable && \
+        npm install -g gulp bower \
+;fi
 
-# Install nvm (Node Version Manager)
-RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
-
-ENV NVM_DIR=/root/.nvm
-
-# Install stable node
-RUN . ~/.nvm/nvm.sh \
-    && nvm install stable \
-    && nvm use stable \
-    && nvm alias stable \
-    && npm install -g gulp bower
-
-# Source the bash
-RUN . ~/.bashrc
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
 
 # Clean up
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Set default work directory
 WORKDIR /var/www/laravel
-
-# Install optional software
-ARG INSTALL_PRESTISSIMO=false
-RUN if [ "$INSTALL_PRESTISSIMO" = true ] ; then \
-        composer global require "hirak/prestissimo:^0.3"; \
-    fi

workspace/composer.json

@@ -0,0 +1,5 @@
+{
+    "require": {
+
+    }
+}