Merge pull request #123 from appleboy/patch-6

Added support upload file size setting.

.gitignore

@@ -1 +1,2 @@
-/logs
+/logs
+.env

README.md

@@ -141,7 +141,7 @@ LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both gives y
 
 - LaraDock is a tool that controls Docker for you (using Docker Compose official commands). And Docker manages you Virtual Containers.
 
-Running a virtual Container is much faster than running a full virtual Machine. 
+Running a virtual Container is much faster than running a full virtual Machine.
 <br>Thus **LaraDock is much faster than Homestead**.
 
 
@@ -163,7 +163,7 @@ Running a virtual Container is much faster than running a full virtual Machine.
 <a name="Demo"></a>
 ## Demo Video
 
-What's better than a [**Demo Video**](https://www.youtube.com/watch?v=-DamFMczwDA) :) 
+What's better than a [**Demo Video**](https://www.youtube.com/watch?v=-DamFMczwDA) :)
 
 <a name="Installation"></a>
 ## Installation
@@ -190,7 +190,7 @@ 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. 
+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).
 
@@ -223,7 +223,7 @@ You can select your own combination of container form this list:
 ```bash
 docker exec -it {Workspace-Container-Name} bash
 ```
-Replace `{Workspace-Container-Name}` with your Workspace container name. 
+Replace `{Workspace-Container-Name}` with your Workspace container name.
 <br>
 To find the containers names type `docker-compose ps`.
 
@@ -306,7 +306,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):*
 
 
 
@@ -338,7 +338,7 @@ docker exec -it {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 +365,7 @@ Change Redis defaut port to 1111:
 <a name="Edit-a-Docker-Image"></a>
 ### 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,
 <br>
 example for `mysql` it will be `mysql/Dockerfile`.
 
@@ -424,7 +424,7 @@ To add an image (software), just edit the `docker-compose.yml` and add your cont
 
 <br>
 <a name="View-the-Log-files"></a>
-### 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 +464,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:
 
@@ -518,13 +518,6 @@ Composer update
 phpunit
 ```
 
-
-
-
-
-
-
-
 <br>
 <a name="Use-Redis"></a>
 ### Use Redis
@@ -627,7 +620,7 @@ More details about this [here](https://github.com/jenssegers/laravel-mongodb#ins
 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`.
+- Enter the Workspace Container `docker exec -it laradock_workspace_1 bash`.
 - Migrate the Database `php artisan migrate`.
 
 
@@ -672,11 +665,11 @@ By default **PHP-FPM 7.0** is running.
 
 2 - Search for `Dockerfile-70` in the PHP container section.
 
-3 - Change the version number. 
+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: 
+Sample:
 
 ```txt
 php-fpm:
@@ -768,9 +761,9 @@ eval $(docker-machine env)
 
 <br>
 <a name="Find-Docker-IP-Address"></a>
-### Find your Docker IP Address 
+### Find your Docker IP Address
 
-**On Windows & MAC:** 
+**On Windows & MAC:**
 
 Run this command in your terminal:
 
@@ -786,7 +779,7 @@ If your Host name is different then `default`, you have to specify it (`docker-m
 > **boot2docker** users: run `boot2docker ip` *(when boot2docker is up)*.
 
 <br>
-**On Linux:** 
+**On Linux:**
 
 Run this command in your terminal:
 
@@ -873,8 +866,22 @@ Additionally, you can contact Mahmoud Zalt (the creator of this project) via a d
 
 ## 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:**
+
+- [Bo-Yi Wu](https://github.com/appleboy)
+- [Amin Mkh](https://github.com/AminMkh)
+- [Matthew Tonkin Dunn](https://github.com/mattythebatty)
+- [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
 

docker-compose.yml

@@ -153,7 +153,10 @@ services:
 ### Workspace Utilities Container ###########################
 
     workspace:
-        build: ./workspace
+        build:
+            context: ./workspace
+            args:
+                INSTALL_PRESTISSIMO: ${INSTALL_PRESTISSIMO}
         volumes_from:
             - application
         tty: true

nginx/nginx.conf

@@ -15,6 +15,7 @@ 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;

php-fpm/Dockerfile-55

@@ -11,9 +11,17 @@ RUN apt-get update && apt-get install -y \
     curl \
     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 \
@@ -33,9 +41,6 @@ RUN pecl install memcached \
 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

@@ -11,9 +11,17 @@ RUN apt-get update && apt-get install -y \
     curl \
     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 \
@@ -33,9 +41,6 @@ RUN pecl install memcached \
 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

@@ -11,9 +11,17 @@ RUN apt-get update && apt-get install -y \
     curl \
     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 \
@@ -37,9 +45,6 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
 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

@@ -2,3 +2,13 @@ date.timezone=UTC
 display_errors=Off
 log_errors=On
 extension=mongodb.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

workspace/Dockerfile

@@ -88,3 +88,9 @@ RUN . ~/.bashrc
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 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