Merge pull request #123 from appleboy/patch-6

Added support upload file size setting.

README.md

@@ -221,7 +221,7 @@ You can select your own combination of container form this list:
 3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
 
 ```bash
-docker-compose run workspace bash
+docker exec -it {Workspace-Container-Name} bash
 ```
 Replace `{Workspace-Container-Name}` with your Workspace container name.
 <br>
@@ -323,7 +323,7 @@ docker-compose down
 2 - enter any container using:
 
 ```bash
-docker-compose run {container-name} bash
+docker exec -it {container-name} bash
 ```
 3 - to exit a container, type `exit`.
 
@@ -494,13 +494,19 @@ 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 exec -it {workspace-container-name} bash
+```
+
+4 - Run anything you want :)
 
 ```bash
 php artisan
@@ -614,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-compose run workspace bash`.
+- Enter the Workspace Container `docker exec -it laradock_workspace_1 bash`.
 - Migrate the Database `php artisan migrate`.
 
 
@@ -860,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))
+**Creator:**
-- [Awesome list of contributors](https://github.com/LaraDock/laradock/graphs/contributors)
+
+- [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
 

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