diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..87ac0112
--- /dev/null
+++ b/.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
diff --git a/.gitignore b/.gitignore
index b152f57d..28b085f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/logs
+/data
.env
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..9e1cedbc
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,130 @@
+
+
+# Contributing to LaraDock
+
+Your contribution is more than welcome. Let's keep LaraDock amazing.
+
+
+### Got a Question or Problem?
+
+If you have questions about how to use LaraDock, please direct your questions to the discussion on [Gitter](https://gitter.im/LaraDock/laradock). If you beleave your question could help others, then consider opening an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as Question).
+
+### Found an Issue?
+If you find a bug in the source code or a mistake in the documentation, you can help us by
+submitting an [Issue](https://github.com/laradock/laradock/issues). Even better you can submit a Pull Request with a fix.
+
+### Want a Feature?
+You can request a new feature by submitting an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as Feature Suggestion). If you would like to implement a new feature then consider submitting a Pull Request.
+
+
+## Coding Guidelines
+
+### Support new Software
+
+* Create folder with the software name.
+
+* Add a `Dockerfile`, write your code there.
+
+* You may add additional files in the software folder.
+
+* Add the software to the `docker-compose.yml` file.
+
+* Make sure you follow our commenting style.
+
+* Add the software in the `Readme`.
+
+### Edit existing Software
+
+* Open the software (container) folder.
+
+* Edit the files you want to update.
+
+* **Note:** If you want to edit the base image of the `Workspace` or the `php-fpm` Containers,
+you need to edit their Dockerfiles from their Github repositories. For more info read their Dockerfiles comment on the LaraDock repository.
+
+* Make sure to update the `Readme` incase you made any changes.
+
+## Issue/PR Submission Guidelines
+
+### Submitting an Issue
+Before you submit your issue search the archive, maybe your question was already answered.
+
+If your issue appears to be a bug, and hasn't been reported, open a new issue.
+Help us to maximize the effort we can spend fixing issues and adding new
+features, by not reporting duplicate issues.
+
+
+
+### Submitting a Pull Request (PR)
+Before you submit your pull request consider the following guidelines:
+
+* Search [GitHub](https://github.com/LaraDock/laradock/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate effort.
+
+* Make your changes in a new git branch:
+
+ ```shell
+ git checkout -b my-fix-branch master
+ ```
+* Commit your changes using a descriptive commit message.
+
+* Push your branch to GitHub:
+
+ ```shell
+ git push origin my-fix-branch
+ ```
+
+* In GitHub, send a pull request to `laradock:master`.
+* If we suggest changes then:
+ * Make the required updates.
+ * Commit your changes to your branch (e.g. `my-fix-branch`).
+ * Push the changes to your GitHub repository (this will update your Pull Request).
+
+> If the PR gets too outdated we may ask you to rebase and force push to update the PR:
+
+```shell
+git rebase master -i
+git push origin my-fix-branch -f
+```
+
+*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments on code that were previously made by you and others in your commits.*
+
+
+
+
+
+
+### After your pull request is merged
+
+After your pull request is merged, you can safely delete your branch and pull the changes
+from the main (upstream) repository:
+
+* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
+
+ ```shell
+ git push origin --delete my-fix-branch
+ ```
+
+* Check out the master branch:
+
+ ```shell
+ git checkout master -f
+ ```
+
+* Delete the local branch:
+
+ ```shell
+ git branch -D my-fix-branch
+ ```
+
+* Update your master with the latest upstream version:
+
+ ```shell
+ git pull --ff upstream master
+ ```
+
+
+
+
+
+
+### Happy Coding :)
\ No newline at end of file
diff --git a/README.md b/README.md
index cc55b3f4..91710d6b 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,16 @@
[](http://zalt.me)
+[](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.
It's like Laravel Homestead but for Docker instead of Vagrant.
+>With LaraDock, use Docker first and learn about it later.
-
+
+
## Contents
@@ -16,7 +19,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
- [Intro](#Intro)
- [Features](#features)
- - [Supported Containers](#Supported-Containers)
+ - [Supported Software's](#Supported-Containers)
- [What is Docker](#what-is-docker)
- [What is Laravel](#what-is-laravel)
- [Why Docker not Vagrant](#why-docker-not-vagrant)
@@ -45,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)
+ - [Upgrading LaraDock](#upgrading-laradock)
- [Help & Questions](#Help)
@@ -61,49 +67,65 @@ 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`.
+**Usage Overview:**
+
+Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL` and `Redis`. Then run `Laravel`.
+
+1. Get LaraDock inside your Laravel project:
+
+`git clone https://github.com/LaraDock/laradock.git`.
+2. Enter the laradock folder and run only these Containers:
+
+`docker-compose up -d nginx mysql redis`
+3. Open your `.env` file and set `DB_HOST` to `mysql` and `REDIS_HOST` to `redis`.
+4. Open your browser and visit the localhost: `http://localdock`
+
-```shell
-docker-compose up nginx mysql redis
-```
### 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..
-### Supported Containers
+### Supported Software's (Containers)
-- PHP-FPM (7.0 - 5.6 - 5.5)
-- NGINX
-- MySQL
-- PostgreSQL
-- MariaDB
-- Neo4j
-- MongoDB
-- Redis
-- Memcached
-- Beanstalkd
-- Beanstalkd Console
-- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite, Vim, Nano and cURL)
-- Data *(Databases Data Container)*
-- Application *(Application Code Container)*
+- **Database Engines:**
+ - MySQL
+ - PostgreSQL
+ - MariaDB
+ - MongoDB
+ - Neo4j
+- **Cache Engines:**
+ - Redis
+ - Memcached
+- **PHP Servers:**
+ - NGINX
+ - Apache2
+ - Caddy
+- **PHP Compilers:**
+ - PHP-FPM
+ - HHVM
+- **Message Queueing Systems:**
+ - Beanstalkd (+ Beanstalkd Console)
+- **Tools:**
+ - Workspace (PHP7-CLI, Composer, 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 :)
+>If you can't find your Software, build it yourself and add it to this list. Contributions are welcomed :)
@@ -112,7 +134,7 @@ docker-compose up nginx mysql redis
### What is Docker?
-[Docker](https://www.docker.com) is an open-source project that automates the deployment of applications inside software containers, by providing an additional layer of abstraction and automation of [operating-system-level virtualization](https://en.wikipedia.org/wiki/Operating-system-level_virtualization) on Linux, Mac OS and Windows.
+[Docker](https://www.docker.com) is an open-source project that automates the deployment of applications inside software containers, by providing an additional layer of abstraction and automation of [operating-system-level virtualization](https://en.wikipedia.org/wiki/Operating-system-level_virtualization) on Linux, Mac OS and Windows.
### What is Laravel?
@@ -127,7 +149,7 @@ Seriously!!!
Instead of providing a full Virtual Machines, like you get with Vagrant, Docker provides you **lightweight** Virtual Containers, that share the same kernel and allow to safely execute independent processes.
-In addition to the speed, Docker gives tens of features that cannot be achieved with Vagrant.
+In addition to the speed, Docker gives tons of features that cannot be achieved with Vagrant.
Most importantly Docker can run on Development and on Production (same environment everywhere). While Vagrant is designed for Development only, (so you have to re-provision your server on Production every time).
@@ -139,22 +161,9 @@ LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both gives y
- Homestead is a tool that controls Vagrant for you (using Homestead special commands). And Vagrant manages your Virtual Machine.
-- LaraDock is a tool that controls Docker for you (using Docker Compose official commands). And Docker manages you Virtual Containers.
+- LaraDock is a tool that controls Docker for you (using Docker & Docker Compose official commands). And Docker manages your Virtual Containers.
-Running a virtual Container is much faster than running a full virtual Machine.
-
Thus **LaraDock is much faster than Homestead**.
-
-
-
-
-## Requirements
-
-| Linux | Windows & MAC |
-|-----------------------------------------------------------------------------------------|---------------------------------------------------------|
-| [Laravel](https://laravel.com/docs/master/installation) | [Laravel](https://laravel.com/docs/master/installation) |
-| [Git](https://git-scm.com/downloads) | [Git](https://git-scm.com/downloads) |
-| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) | [Docker Toolbox](https://www.docker.com/toolbox) |
-| [Docker Compose](https://docs.docker.com/compose/install) | |
+Running a virtual Container is much faster than running a full virtual Machine. Thus **LaraDock is much faster than Homestead**.
@@ -163,15 +172,30 @@ Running a virtual Container is much faster than running a full virtual Machine.
## Demo Video
-What's better than a [**Demo Video**](https://www.youtube.com/watch?v=-DamFMczwDA) :)
+What's better than a **Demo Video**:
+
+- LaraDock v4.0 (Coming soon..)
+- LaraDock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA)
+- LaraDock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
+- LaraDock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
+
+
+
+
+## Requirements
+
+- [Git](https://git-scm.com/downloads)
+- [Docker](https://www.docker.com/products/docker/)
+
+
## 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:
+**A)** If you already have a Laravel project, clone this repository on your `Laravel` root directory:
```bash
git submodule add https://github.com/LaraDock/laradock.git
@@ -190,13 +214,21 @@ git clone https://github.com/LaraDock/laradock.git
## Usage
-1 - For **Windows & MAC** users only: If you are not using the native Docker-Engine `Beta`, make sure you have a running Docker Virtual Host on your machine.
-[How to run a Docker Virtual Host?](#Run-Docker-Virtual-Host)
-(**Linux** users don't need a Virtual Host, so skip this step).
+**Read Before starting:**
+
+If you are using **Docker Toolbox** (VM), do one of the following:
+
+- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](#upgrading-laradock)
+- Use LaraDock v3.* (Visit the `LaraDock-ToolBox` [Branch](https://github.com/LaraDock/laradock/tree/LaraDock-ToolBox)).
+
+
+If you are using **Docker Native** (For Mac/Windows) or even for Linux, continue this documentation normally since LaraDock v4 and above is just for that.
+
-2 - Run some Containers: *(Make sure you are in the `laradock` folder before running the `docker-compose` commands).*
+
+1 - Run Containers: *(Make sure you are in the `laradock` folder before running the `docker-compose` commands).*
@@ -206,46 +238,43 @@ git clone https://github.com/LaraDock/laradock.git
docker-compose up -d nginx mysql
```
-You can select your own combination of container form this list:
+You can select your own combination of Containers form the list below:
-`nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `data`, `php-fpm`, `application`.
-
-
-**Note**: `workspace`, `data`, `php-fpm` and `application` will run automatically in most of the cases.
+`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`.
+**Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command.
-3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
+2 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
```bash
-docker-compose run workspace bash
+docker-compose exec workspace bash
```
-Replace `{Workspace-Container-Name}` with your Workspace container name.
-
-To find the containers names type `docker-compose ps`.
+
+Add `--user=laradock` (example `docker-compose exec --user=laradock workspace bash`) to have files created as your host's user. (you can change the PUID (User id) and PGID (group id) variables from the `docker-compose.yml`).
-4 - Edit the Laravel configurations.
+3 - Edit the Laravel configurations.
If you don't have a Laravel project installed yet, see [How to Install Laravel in a Docker Container](#Install-Laravel).
-Open your Laravel's `.env` file and set the `DB_HOST` to your `{Docker-IP}`:
+Open your Laravel's `.env` file and set the `DB_HOST` to your `mysql`:
```env
-DB_HOST=xxx.xxx.xxx.xxx
+DB_HOST=mysql
```
-[How to find my Docker IP Address?](#Find-Docker-IP-Address)
+
-5 - Open your browser and visit your `{Docker-IP}` address (`http://xxx.xxx.xxx.xxx`).
+4 - Open your browser and visit your localhost address (`http://localhost/`).
@@ -260,7 +289,6 @@ If you need a special support. Contact me, more details in the [Help & Questions
## Documentation
-
### [Docker]
@@ -306,7 +334,7 @@ docker-compose stop {container-name}
docker-compose down
```
-*Note: Careful with this command as it will delete your Data Volume Container as well. (if you want to keep your Database data than you should stop each container by itself as follow):*
+*Note: Careful with this command as it will delete your Data Volume Container as well. (if you want to keep your Database data than you should stop each container by itself as follow):*
@@ -323,8 +351,15 @@ docker-compose down
2 - enter any container using:
```bash
-docker-compose run {container-name} bash
+docker-compose exec {container-name} bash
```
+
+*Example: enter MySQL container*
+
+```bash
+docker-compose exec mysql bash
+```
+
3 - to exit a container, type `exit`.
@@ -338,7 +373,7 @@ docker-compose run {container-name} bash
### Edit default container configuration
Open the `docker-compose.yml` and change anything you want.
-Examples:
+Examples:
Change MySQL Database Name:
@@ -365,7 +400,7 @@ Change Redis defaut port to 1111:
### Edit a Docker Image
-1 - Find the `dockerfile` of the image you want to edit,
+1 - Find the `dockerfile` of the image you want to edit,
example for `mysql` it will be `mysql/Dockerfile`.
@@ -376,10 +411,7 @@ example for `mysql` it will be `mysql/Dockerfile`.
```bash
docker-compose build mysql
```
-
-*If you find any bug or you have and suggestion that can improve the performance of any image, please consider contributing. Thanks in advance.*
-
-
+More info on Containers rebuilding [here](#Build-Re-build-Containers).
@@ -403,6 +435,7 @@ Optionally you can specify which container to rebuild (instead of rebuilding all
docker-compose build {container-name}
```
+You might use the `--no-cache` option if you want full rebuilding (`docker-compose build --no-cache {container-name}`).
@@ -424,7 +457,7 @@ To add an image (software), just edit the `docker-compose.yml` and add your cont
-### View the Log files
+### View the Log files
The Nginx Log file is stored in the `logs/nginx` directory.
However to view the logs of all the other containers (MySQL, PHP-FPM,...) you can run this:
@@ -464,7 +497,7 @@ For more about the Laravel installation click [here](https://laravel.com/docs/ma
3 - Edit `docker-compose.yml` to Map the new application path:
-By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder.
+By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder.
Since the new Laravel application is in the `my-cool-app` folder, we need to replace `../:/var/www/laravel` with `../my-cool-app/:/var/www/laravel`, as follow:
@@ -480,6 +513,8 @@ Since the new Laravel application is in the `my-cool-app` folder, we need to rep
cd my-cool-app
```
+5 - Go back to the laraDock installation steps to see how to edit the `.env` file.
+
@@ -494,13 +529,22 @@ You can run artisan commands and many other Terminal commands from the Workspace
docker-compose up -d workspace // ..and all your other containers
```
-2 - Enter the Workspace container:
+2 - Find the Workspace container name:
```bash
-docker-compose run workspace /bin/bash
+docker-compose ps
```
-3 - Run anything you want :)
+3 - Enter the Workspace container:
+
+```bash
+docker-compose exec workspace bash
+```
+
+Add `--user=laradock` (example `docker-compose exec --user=laradock workspace bash`) to have files created as your host's user.
+
+
+4 - Run anything you want :)
```bash
php artisan
@@ -522,19 +566,19 @@ phpunit
docker-compose up -d redis
```
-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.
+2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to `redis`
```env
-REDIS_HOST=xxx.xxx.xxx.xxx
+REDIS_HOST=redis
```
-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:
+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 `redis` for Redis like this:
```php
'redis' => [
'cluster' => false,
'default' => [
- 'host' => 'xxx.xxx.xxx.xxx',
+ 'host' => 'redis',
'port' => 6379,
'database' => 0,
],
@@ -568,14 +612,47 @@ composer require predis/predis:^1.0
### 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:
+
+a) open the `docker-compose.yml` file
+
+b) search for the `INSTALL_MONGO` argument under the Workspace Container
+
+c) set it to `true`
+
+d) search for the `INSTALL_MONGO` argument under the PHP-FPM Container
+
+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' => [
@@ -597,24 +674,24 @@ 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_HOST` to your `mongo`.
- 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 Continer `docker-compose run workspace bash`.
+- Enter the Workspace Container.
- Migrate the Database `php artisan migrate`.
@@ -650,20 +727,18 @@ The PHP-CLI extensions should be installed in `workspace/Dockerfile`.
-### 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.
-
-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:
@@ -672,20 +747,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.
+
+
+
@@ -709,10 +797,40 @@ Right now you have to manually edit the `Dockerfile` or create a new one like it
+
+
+### Install xDebug
+1 - First install `xDebug` in the Workspace and the PHP-FPM Containers:
+
+a) open the `docker-compose.yml` file
+
+b) search for the `INSTALL_XDEBUG` argument under the Workspace Container
+
+c) set it to `true`
+
+d) search for the `INSTALL_XDEBUG` argument under the PHP-FPM Container
+
+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`
@@ -721,92 +839,19 @@ Right now you have to manually edit the `Dockerfile` or create a new one like it
### [Misc]
-
-
-
-
-### Run a Docker Virtual Host
-
-These steps are only for **Windows & MAC** users *(Linux users don't need a virtual host)*:
-
-1 - Run the default Host:
-
-```bash
-docker-machine start default
-```
-
-* If the host "default" does not exist, create one using the command below, else skip it:
-
-* ```bash
- docker-machine create -d virtualbox default
- ```
-
-2 - Run this command to configure your shell:
-
-```bash
-eval $(docker-machine env)
-```
-
-
-
-
-
-
-
-
-
-### Find your Docker IP Address
-
-**On Windows & MAC:**
-
-Run this command in your terminal:
-
-```bash
-docker-machine ip default
-```
-If your Host name is different then `default`, you have to specify it (`docker-machine ip my-host`).
-
-*(The default IP is 192.168.99.100)*
-
-
-
-> **boot2docker** users: run `boot2docker ip` *(when boot2docker is up)*.
-
-
-**On Linux:**
-
-Run this command in your terminal:
-
-```shell
-ifconfig docker0 | grep 'inet' | cut -d: -f2 | awk '{ print $1}' | head -n1
-```
-
-*(The default IP is 172.17.0.1)*
-
-
-
### Use custom Domain (instead of the Docker IP)
-Assuming your custom domain is `laravel.dev` and your current `Docker-IP` is `xxx.xxx.xxx.xxx`.
+Assuming your custom domain is `laravel.dev`
-1 - Open your `/etc/hosts` file and map your `Docker IP` to the `laravel.dev` domain, by adding the following:
+1 - Open your `/etc/hosts` file and map your localhost address `127.0.0.1` to the `laravel.dev` domain, by adding the following:
```bash
-xxx.xxx.xxx.xxx laravel.dev
+127.0.0.1 laravel.dev
```
-2 - Open your Laravel's `.env` file and replace the `127.0.0.1` default values with your `{Docker-IP}`.
-
-Example:
-
-```env
-DB_HOST=xxx.xxx.xxx.xxx
-```
-
-3 - Open your browser and visit `{http://laravel.dev}`
-
+2 - Open your browser and visit `{http://laravel.dev}`
Optionally you can define the server name in the nginx config file, like this:
@@ -816,27 +861,122 @@ server_name laravel.dev;
```
+
+
+
+### 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`
+
+
+
+
+
+
+### Install Prestissimo
+
+[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`
+
+
+
+
+
+
+### 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`
+
+
+
### Debugging
*Here's a list of the common problems you might face, and the possible solutions.*
-#### + I see a blank (white) page instead of the Laravel 'Welcome' page!
+#### I see a blank (white) page instead of the Laravel 'Welcome' page!
-run this command from the Laravel root directory:
+Run the following command from the Laravel root directory:
```bash
sudo chmod -R 777 storage bootstrap/cache
```
-#### + I see "Welcome to nginx" instead of the Laravel App!
+#### I see "Welcome to nginx" instead of the Laravel App!
-use `http://127.0.0.1` instead of `http://localhost` in your browser.
+Use `http://127.0.0.1` instead of `http://localhost` in your browser.
+
+#### I see an error message containing `address already in use`
+
+Make sure the ports for the services that you are trying to run (80, 3306, etc.) are not being used already by other programs, such as a built in `apache`/`httpd` service or other development tools you have installed.
+
+
+### Upgrading LaraDock
+
+
+Moving from Docker Toolbox (VirtualBox) to Docker Native (for Mac/Windows). Requires upgrading LaraDock from v3.* to v4.*:
+
+1. Stop the docker vm `docker-machine stop {default}`
+2. Install Docker for [Mac](https://docs.docker.com/docker-for-mac/) or [Windows](https://docs.docker.com/docker-for-windows/).
+3. Upgrade LaraDock to `v4.*.*` (`git pull origin master`)
+4. Use LaraDock as you used to do: `docker-compose up -d nginx mysql`.
+
+**Note:** If you face any problem with the last step above: rebuild all your containers
+`docker-compose build --no-cache`
+"Warnning Containers Data might be lost!"
+
+
@@ -847,21 +987,42 @@ use `http://127.0.0.1` instead of `http://localhost` in your browser.
This little project was built by one man who has a full time job and many responsibilities, so if you like this project and you find that it needs a bug fix or support for new software or upgrade any container, or anything else.. Do not hesitate to contribute, you are more than welcome :)
+#### Read our [Contribution Guidelines](https://github.com/LaraDock/laradock/blob/master/CONTRIBUTING.md)
## 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
-- [Mahmoud Zalt](https://github.com/Mahmoudz) (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
-- [Awesome list of contributors](https://github.com/LaraDock/laradock/graphs/contributors)
+**Creator:**
+
+- [Mahmoud Zalt](https://github.com/Mahmoudz) (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
+
+**Main Contributors:**
+
+- [Suteepat (tianissimo)](https://github.com/tianissimo)
+- [David (davidavz)](https://github.com/davidavz)
+- [Lialosiu](https://github.com/lialosiu)
+- [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:**
+
+- [Contributors](https://github.com/LaraDock/laradock/graphs/contributors)
+- [Supporters](https://github.com/LaraDock/laradock/issues?utf8=%E2%9C%93&q=)
+
## License
diff --git a/apache2/Dockerfile b/apache2/Dockerfile
new file mode 100644
index 00000000..7ee9b855
--- /dev/null
+++ b/apache2/Dockerfile
@@ -0,0 +1,17 @@
+FROM webdevops/apache:ubuntu-16.04
+
+MAINTAINER Eric Pfeiffer
+
+ARG PHP_SOCKET="php-fpm:9000"
+
+ENV WEB_PHP_SOCKET=$PHP_SOCKET
+
+ENV WEB_DOCUMENT_ROOT=/var/www/laravel/public
+
+EXPOSE 80 443
+
+WORKDIR /var/www/laravel/public
+
+ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
+
+CMD ["supervisord"]
diff --git a/beanstalkd-console/Dockerfile b/beanstalkd-console/Dockerfile
index f42178dd..b07f1e36 100644
--- a/beanstalkd-console/Dockerfile
+++ b/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'
\ No newline at end of file
+CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
new file mode 100644
index 00000000..5052db32
--- /dev/null
+++ b/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
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
new file mode 100644
index 00000000..9bf05ec7
--- /dev/null
+++ b/caddy/Dockerfile
@@ -0,0 +1,25 @@
+FROM alpine:3.4
+
+MAINTAINER Eric Pfeiffer
+
+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"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 087cea3d..a2313182 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,45 +2,48 @@ version: '2'
services:
+### Workspace Utilities Container ###########################
+
+ workspace:
+ build:
+ context: ./workspace
+ args:
+ - INSTALL_MONGO=false
+ - INSTALL_XDEBUG=false
+ - INSTALL_NODE=false
+ - COMPOSER_GLOBAL_INSTALL=false
+ - PUID=1000
+ - PGID=1000
+ volumes_from:
+ - volumes_source
+ tty: true
+
### PHP-FPM Container #######################################
php-fpm:
build:
context: ./php-fpm
+ args:
+ - INSTALL_MONGO=false
+ - INSTALL_XDEBUG=false
+ - INSTALL_ZIP_ARCHIVE=false
dockerfile: Dockerfile-70
volumes_from:
- - application
+ - volumes_source
expose:
- "9000"
links:
- workspace
-### Laravel Application Code Container ######################
-
- application:
- build: ./application
- volumes:
- - ../:/var/www/laravel
-
-### Databases Data Container ################################
-
- data:
- build: ./data
- volumes:
- - /var/lib/mysql:/var/lib/mysql
- - /var/lib/postgres:/var/lib/postgres
- - /var/lib/mariadb:/var/lib/mariadb
- - /var/lib/memcached:/var/lib/memcached
- - /var/lib/redis:/data
- - /var/lib/neo4j:/var/lib/neo4j/data
- - /var/lib/mongo:/data/db
-
### Nginx Server Container ##################################
nginx:
- build: ./nginx
+ build:
+ context: ./nginx
+ args:
+ - PHP_UPSTREAM=php-fpm
volumes_from:
- - application
+ - volumes_source
volumes:
- ./logs/nginx/:/var/log/nginx
ports:
@@ -49,12 +52,40 @@ services:
links:
- php-fpm
+### Apache Server Container ##################################
+
+ apache2:
+ build:
+ context: ./apache2
+ args:
+ - PHP_SOCKET="php-fpm:9000"
+ volumes_from:
+ - volumes_source
+ volumes:
+ - ./logs/apache2:/var/log/apache2
+ ports:
+ - "80:80"
+ - "443:443"
+ links:
+ - php-fpm
+
+### HHVM Container ##########################################
+
+ hhvm:
+ build: ./hhvm
+ volumes_from:
+ - volumes_source
+ expose:
+ - "9000"
+ links:
+ - workspace
+
### MySQL Container #########################################
mysql:
build: ./mysql
volumes_from:
- - data
+ - volumes_data
ports:
- "3306:3306"
environment:
@@ -68,7 +99,7 @@ services:
postgres:
build: ./postgres
volumes_from:
- - data
+ - volumes_data
ports:
- "5432:5432"
environment:
@@ -81,7 +112,7 @@ services:
mariadb:
build: ./mariadb
volumes_from:
- - data
+ - volumes_data
ports:
- "3306:3306"
environment:
@@ -100,7 +131,7 @@ services:
environment:
- NEO4J_AUTH=homestead:secret
volumes_from:
- - data
+ - volumes_data
### MongoDB Container #######################################
@@ -109,14 +140,14 @@ services:
ports:
- "27017:27017"
volumes_from:
- - data
+ - volumes_data
### Redis Container #########################################
redis:
build: ./redis
volumes_from:
- - data
+ - volumes_data
ports:
- "6379:6379"
@@ -125,7 +156,7 @@ services:
memcached:
build: ./memcached
volumes_from:
- - data
+ - volumes_data
ports:
- "11211:11211"
links:
@@ -150,15 +181,39 @@ services:
links:
- beanstalkd
-### Workspace Utilities Container ###########################
+### Caddy Server Container ##################################
- workspace:
- build:
- context: ./workspace
- args:
- INSTALL_PRESTISSIMO: ${INSTALL_PRESTISSIMO}
+ caddy:
+ build: ./caddy
volumes_from:
- - application
- tty: true
+ - volumes_source
+ ports:
+ - "80:80"
+ - "443:443"
+ - "2015:2015"
+ volumes:
+ - ./caddy/Caddyfile:/etc/Caddyfile
+ links:
+ - php-fpm
+
+### Laravel Application Code Container ######################
+
+ volumes_source:
+ build: ./volumes/application
+ volumes:
+ - ../:/var/www/laravel
+
+### Databases Data Container ################################
+
+ volumes_data:
+ build: ./volumes/data
+ volumes:
+ - ./data/mysql:/var/lib/mysql
+ - ./data/postgres:/var/lib/postgres
+ - ./data/mariadb:/var/lib/mariadb
+ - ./data/memcached:/var/lib/memcached
+ - ./data/redis:/data
+ - ./data/neo4j:/var/lib/neo4j/data
+ - ./data/mongo:/data/db
### Add more Containers below ###############################
diff --git a/hhvm/Dockerfile b/hhvm/Dockerfile
new file mode 100644
index 00000000..a9569c9c
--- /dev/null
+++ b/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
diff --git a/hhvm/server.ini b/hhvm/server.ini
new file mode 100644
index 00000000..47d20172
--- /dev/null
+++ b/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
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 495382fe..f9bfc1ba 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,13 +1,18 @@
-FROM nginx:latest
+FROM nginx:alpine
MAINTAINER Mahmoud Zalt
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"]
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 17ac8821..cc7fa68e 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,6 +1,7 @@
user www-data;
worker_processes 4;
pid /run/nginx.pid;
+daemon off;
events {
worker_connections 2048;
@@ -15,15 +16,13 @@ http {
tcp_nodelay on;
keepalive_timeout 15;
types_hash_max_size 2048;
+ 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;
diff --git a/php-fpm/Dockerfile-55 b/php-fpm/Dockerfile-55
deleted file mode 100644
index ae4dbdb3..00000000
--- a/php-fpm/Dockerfile-55
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM php:5.5-fpm
-
-MAINTAINER Mahmoud Zalt
-
-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 \
- libpng12-dev \
- libfreetype6-dev \
- --no-install-recommends \
- && rm -r /var/lib/apt/lists/*
-
-# configure gd library
-RUN docker-php-ext-configure gd \
- --enable-gd-native-ttf \
- --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
-
-# Install mongodb driver
-RUN pecl install mongodb
-
-RUN usermod -u 1000 www-data
-
-WORKDIR /var/www/laravel
-
-CMD ["php-fpm"]
-
-EXPOSE 9000
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
index f14a16f4..fd881705 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -1,40 +1,88 @@
-FROM php:5.6-fpm
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+# To edit the 'php-fpm' base Image, visit its repository on Github
+# https://github.com/LaraDock/php-fpm
+#
+# To change its version, see the available Tags on the Docker Hub:
+# https://hub.docker.com/r/laradock/php-fpm/tags/
+#
+
+FROM laradock/php-fpm:5.6--1.1
MAINTAINER Mahmoud Zalt
+#
+#--------------------------------------------------------------------------
+# 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
+# - INSTALL_ZIP_ARCHIVE= 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
+
+#####################################
+# ZipArchive:
+#####################################
+
+ARG INSTALL_ZIP_ARCHIVE=true
+ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
+RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
+ # Install the zip extention
+ pecl install zip \
+;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 \
- libpng12-dev \
- libfreetype6-dev \
- --no-install-recommends \
- && rm -r /var/lib/apt/lists/*
-
-# configure gd library
-RUN docker-php-ext-configure gd \
- --enable-gd-native-ttf \
- --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
-
-# Install mongodb driver
-RUN pecl install mongodb
+RUN rm -r /var/lib/apt/lists/*
RUN usermod -u 1000 www-data
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index d046d278..ed28119f 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -1,44 +1,88 @@
-FROM php:7.0-fpm
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+# To edit the 'php-fpm' base Image, visit its repository on Github
+# https://github.com/LaraDock/php-fpm
+#
+# To change its version, see the available Tags on the Docker Hub:
+# https://hub.docker.com/r/laradock/php-fpm/tags/
+#
+
+FROM laradock/php-fpm:7.0--1.1
MAINTAINER Mahmoud Zalt
+#
+#--------------------------------------------------------------------------
+# 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
+# - INSTALL_ZIP_ARCHIVE= 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
+
+#####################################
+# ZipArchive:
+#####################################
+
+ARG INSTALL_ZIP_ARCHIVE=true
+ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
+RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
+ # Install the zip extention
+ pecl install zip \
+;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 \
- libpng12-dev \
- libfreetype6-dev \
- --no-install-recommends \
- && rm -r /var/lib/apt/lists/*
-
-# configure gd library
-RUN docker-php-ext-configure gd \
- --enable-gd-native-ttf \
- --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
-
-# Install mongodb driver
-RUN pecl install mongodb
+RUN rm -r /var/lib/apt/lists/*
RUN usermod -u 1000 www-data
diff --git a/php-fpm/laravel.ini b/php-fpm/laravel.ini
index b31c55b7..dea3703b 100644
--- a/php-fpm/laravel.ini
+++ b/php-fpm/laravel.ini
@@ -2,3 +2,14 @@ date.timezone=UTC
display_errors=Off
log_errors=On
extension=mongodb.so
+extension=zip.so
+
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 128M
+; Maximum allowed size for uploaded files.
+; http://php.net/upload-max-filesize
+upload_max_filesize = 20M
+; Sets max size of post data allowed.
+; http://php.net/post-max-size
+post_max_size = 20M
diff --git a/application/Dockerfile b/volumes/application/Dockerfile
similarity index 100%
rename from application/Dockerfile
rename to volumes/application/Dockerfile
diff --git a/data/Dockerfile b/volumes/data/Dockerfile
similarity index 100%
rename from data/Dockerfile
rename to volumes/data/Dockerfile
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 9e12b10b..f414f34b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1,96 +1,136 @@
-FROM phusion/baseimage:latest
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+# To edit the 'workspace' base Image, visit its repository on Github
+# https://github.com/LaraDock/workspace
+#
+# To change its version, see the available Tags on the Docker Hub:
+# https://hub.docker.com/r/laradock/workspace/tags/
+#
+
+FROM laradock/workspace:1.1
MAINTAINER Mahmoud Zalt
-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
+#####################################
+# Non-Root User:
+#####################################
-# Add bin folder of composer to PATH.
-RUN echo "export PATH=${PATH}:/var/www/laravel/vendor/bin" >> ~/.bashrc
+# Add a non-root user to prevent files being created with root permissions on host machine.
+ARG PUID=1000
+ARG PGID=1000
+RUN groupadd -g $PGID laradock && \
+ useradd -u $PUID -g laradock -m laradock
-# Install Composer
-RUN curl -s http://getcomposer.org/installer | php \
- && mv composer.phar /usr/local/bin/composer
+#####################################
+# Composer:
+#####################################
-# Load xdebug Zend extension with phpunit command
-RUN echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc
+# Add the composer.json
+COPY ./composer.json /home/laradock/.composer/composer.json
-# Install mongodb extension
-RUN pecl install mongodb
-RUN echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini
+# Make sure that ~/.composer belongs to laradock
+RUN chown -R laradock:laradock /home/laradock/.composer
+USER laradock
-# Install nvm (Node Version Manager)
-RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
+# Check if global install need to be ran
+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
-ENV NVM_DIR=/root/.nvm
+#####################################
+# Node / NVM:
+#####################################
-# Install stable node
-RUN . ~/.nvm/nvm.sh \
- && nvm install stable \
- && nvm use stable \
- && nvm alias stable \
- && npm install -g gulp bower
+# Check if NVM needs to be installed
+ARG INSTALL_NODE=true
+ENV INSTALL_NODE ${INSTALL_NODE}
+ENV NVM_DIR /home/laradock/.nvm
+RUN if [ ${INSTALL_NODE} = true ]; then \
+ # Install nvm (A Node Version Manager)
+ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash && \
+ . ~/.nvm/nvm.sh && \
+ nvm install stable && \
+ nvm use stable && \
+ nvm alias stable && \
+ npm install -g gulp bower \
+;fi
-# Source the bash
-RUN . ~/.bashrc
+# Wouldn't execute when added to the RUN statement in the above block
+# Source NVM when loading bash since ~/.profile isn't loaded on non-login shell
+RUN if [ ${INSTALL_NODE} = true ]; then \
+ echo "" >> ~/.bashrc && \
+ echo 'export NVM_DIR="$HOME/.nvm"' >> ~/.bashrc && \
+ echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \
+;fi
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
# Clean up
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+USER root
+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
\ No newline at end of file
diff --git a/workspace/composer.json b/workspace/composer.json
new file mode 100644
index 00000000..0c1370f3
--- /dev/null
+++ b/workspace/composer.json
@@ -0,0 +1,5 @@
+{
+ "require": {
+
+ }
+}