Merge pull request #112 from appleboy/patch-2

Fixed Change wrong project name.

README.md

@@ -40,6 +40,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Install Laravel from a Docker Container](#Install-Laravel)
 		- [Run Artisan Commands](#Run-Artisan-Commands)
 		- [Use Redis](#Use-Redis)
+		- [Use Mongo](#Use-Mongo)
 	- [PHP](#PHP)
 		- [Install PHP Extensions](#Install-PHP-Extensions)
 		- [Change the PHP-FPM Version](#Change-the-PHP-FPM-Version)
@@ -92,6 +93,7 @@ docker-compose up  nginx mysql redis
 - PostgreSQL
 - MariaDB
 - Neo4j
+- MongoDB
 - Redis
 - Memcached
 - Beanstalkd
@@ -189,15 +191,14 @@ git clone https://github.com/LaraDock/laradock.git
 
 
 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).
 
-[How to run a Docker Virtual Host?](#Run-Docker-Virtual-Host)
-
 
 <br>
-2 - Run the Containers, (you can select the containers that you wish to run)
-<br>
-*Make sure you are in the `laradock` folder before running the `docker-compose` command.*
+2 - Run some Containers: *(Make sure you are in the `laradock` folder before running the `docker-compose` commands).*
+
+
 
 **Example:** Running NGINX and MySQL:
 
@@ -205,10 +206,14 @@ git clone https://github.com/LaraDock/laradock.git
 docker-compose up -d  nginx mysql
 ```
 
-*Note: the PHP-FPM, Workspace, Application and Data Containers will automatically run.*
+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`.
+
+
+**Note**: `workspace`, `data`, `php-fpm` and `application` will run automatically in most of the cases.
 
 
-Supported Containers: `nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `data`, `php-fpm`, `application`.
 
 
 
@@ -512,9 +517,6 @@ Composer update
 ```bash
 phpunit
 ```
-```bash
-laravel new blog
-```
 
 
 
@@ -527,7 +529,11 @@ laravel new blog
 <a name="Use-Redis"></a>
 ### Use Redis
 
-1 - First make sure you run the Redis Container with the `docker-compose` command.
+1 - First make sure you run the Redis Container (`redis`) with the `docker-compose up` command.
+
+```bash
+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.
 
@@ -555,7 +561,7 @@ CACHE_DRIVER=redis
 SESSION_DRIVER=redis
 ```
 
-4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer first.
+4 - Finally make sure you have the `predis/predis` package `(~1.0)` installed via Composer:
 
 ```bash
 composer require predis/predis:^1.0
@@ -571,6 +577,59 @@ composer require predis/predis:^1.0
 
 
 
+<br>
+<a name="Use-Mongo"></a>
+### Use Mongo
+
+1 - First make sure you 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:
+
+```php
+'connections' => [
+
+    'mongodb' => [
+        'driver'   => 'mongodb',
+        'host'     => env('DB_HOST', 'localhost'),
+        'port'     => env('DB_PORT', 27017),
+        'database' => env('DB_DATABASE', 'database'),
+        'username' => '',
+        'password' => '',
+        'options'  => [
+            'database' => '',
+        ]
+    ],
+
+	// ...
+
+],
+```
+
+3 - 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.
+
+```bash
+composer require jenssegers/mongodb
+```
+More details about this [here](https://github.com/jenssegers/laravel-mongodb#installation).
+
+5 - 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 exec -it laradock_workspace_1 bash`.
+- Migrate the Database `php artisan migrate`.
+
 
 
 

docker-compose.yml

@@ -31,8 +31,9 @@ services:
             - /var/lib/postgres:/var/lib/postgres
             - /var/lib/mariadb:/var/lib/mariadb
             - /var/lib/memcached:/var/lib/memcached
-            - /var/lib/neo4j:/var/lib/neo4j/data
             - /var/lib/redis:/data
+            - /var/lib/neo4j:/var/lib/neo4j/data
+            - /var/lib/mongo:/data/db
 
 ### Nginx Server Container ##################################
 
@@ -101,6 +102,15 @@ services:
         volumes_from:
             - data
 
+### MongoDB Container #######################################
+
+    mongo:
+        build: ./mongo
+        ports:
+            - "27017:27017"
+        volumes_from:
+            - data
+
 ### Redis Container #########################################
 
     redis:

mongo/Dockerfile

@@ -0,0 +1,12 @@
+FROM mongo:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+#COPY mongo.conf /usr/local/etc/mongo/mongo.conf
+
+VOLUME /data/db /data/configdb
+
+CMD ["mongod"]
+
+EXPOSE 27017
+

php-fpm/Dockerfile-55

@@ -8,17 +8,34 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
     libpq-dev \
     libmemcached-dev \
-    curl
+    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
+    pdo_pgsql \
+    gd
 
-#Install memcached
+# 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

php-fpm/Dockerfile-56

@@ -8,17 +8,34 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
     libpq-dev \
     libmemcached-dev \
-    curl
+    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
+    pdo_pgsql \
+    gd
 
-#Install memcached
+# 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

php-fpm/Dockerfile-70

@@ -8,12 +8,22 @@ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
 RUN apt-get update && apt-get install -y \
     libpq-dev \
     libmemcached-dev \
-    curl
+    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
+    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" \
@@ -23,6 +33,13 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
     && 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 usermod -u 1000 www-data
 
 WORKDIR /var/www/laravel

php-fpm/laravel.ini

@@ -1,3 +1,4 @@
-date.timezone = UTC
-display_errors = Off
-log_errors = On
+date.timezone=UTC
+display_errors=Off
+log_errors=On
+extension=mongodb.so

workspace/Dockerfile

@@ -34,37 +34,52 @@ RUN apt-get update && apt-get install -y --force-yes \
         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 \
-        nodejs \
-        nodejs-dev \
-        npm
+        nano
 
 # Clean up, to free some space
 RUN apt-get clean
 
-# Install gulp and bower with NPM
-RUN npm install -g \
-    gulp \
-    bower
+# remove load xdebug extension (only load on phpunit command)
+RUN sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini
 
-# Link the global gulp to be used locally
-RUN npm link gulp
-
-# Add a symbolic link for Node
-RUN ln -s /usr/bin/nodejs /usr/bin/node
-
-# Add an alias for PHPUnit
-RUN echo "alias phpunit='./vendor/bin/phpunit'" >> ~/.bashrc
+# Add bin folder of composer to PATH.
+RUN echo "export PATH=${PATH}:/var/www/laravel/vendor/bin" >> ~/.bashrc
 
 # Install Composer
 RUN curl -s http://getcomposer.org/installer | php \
-    && mv composer.phar /usr/local/bin/ \
-    && echo "alias composer='/usr/local/bin/composer.phar'" >> ~/.bashrc
+    && mv composer.phar /usr/local/bin/composer
+
+# Load xdebug Zend extension with phpunit command
+RUN echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc
+
+# Install mongodb extension
+RUN pecl install mongodb
+RUN echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini
+
+# 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