Merge pull request #165 from orette/mongodb-library-fix

Added pkg-config to the PHP extentions and Tools that are installed from APT

.env

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

.gitignore

@@ -1 +1,3 @@
 /logs
+/data
+.env

README.md

@@ -7,6 +7,7 @@ LaraDock helps you run your **Laravel** App on **Docker** real quick.
 <br>
 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)
 
@@ -49,6 +50,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
 		- [Find your Docker IP Address](#Find-Docker-IP-Address)
 		- [Use custom Domain](#Use-custom-Domain)
+		- [Install Prestissimo](#Install-Prestissimo)
 		- [Debugging](#debugging)
 - [Help & Questions](#Help)
 
@@ -98,7 +100,8 @@ docker-compose up  nginx mysql redis
 - Memcached
 - Beanstalkd
 - Beanstalkd Console
-- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite,  Vim, Nano and cURL)
+- Caddy
+- 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)*
 
@@ -127,7 +130,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,10 +142,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. 
-<br>Thus **LaraDock is much faster than Homestead**.
+Running a virtual Container is much faster than running a full virtual Machine. Thus **LaraDock is much faster than Homestead**.
 
 
 
@@ -150,16 +152,12 @@ Running a virtual Container is much faster than running a full virtual Machine.
 ## 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 Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) | [Docker Toolbox](https://www.docker.com/toolbox) OR [Native Docker](https://beta.docker.com/) |
 | [Docker Compose](https://docs.docker.com/compose/install)                      |                                                                                               |
 
-
-
-
-
 <a name="Demo"></a>
 ## Demo Video
 
@@ -208,7 +206,7 @@ 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`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `caddy`, `workspace`, `data`, `php-fpm`, `application`.
 
 
 **Note**: `workspace`, `data`, `php-fpm` and `application` will run automatically in most of the cases.
@@ -259,6 +257,7 @@ If you need a special support. Contact me, more details in the [Help & Questions
 <a name="Documentation"></a>
 ## Documentation
 
+**Note:** this documentation doesn't cover the Docker Beta *(Native Docker on MAC and Windows)*. However, the commands are very similar. We are planning to cover the Docker Beta soon.
 
 
 <a name="Docker"></a>
@@ -518,13 +517,6 @@ Composer update
 phpunit
 ```
 
-
-
-
-
-
-
-
 <br>
 <a name="Use-Redis"></a>
 ### Use Redis
@@ -627,7 +619,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`.
 
 
@@ -829,30 +821,33 @@ server_name laravel.dev;
 ```
 
 
+<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.
+
 <br>
 <a name="debugging"></a>
 ### 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!
-
-use `http://127.0.0.1` instead of `http://localhost` in your browser.
-
-
-
-
+#### I see "Welcome to nginx" instead of the Laravel App!
 
+Use `http://127.0.0.1` (or [your Docker IP](#Find-Docker-IP-Address)) 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.
 
 
 <br>
@@ -873,8 +868,23 @@ Additionally, you can contact Mahmoud Zalt (the creator of this project) via a d
 
 ## Credits
 
+**Creator:**
+
 - [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)
+
+**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)
+- [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
 

caddy/Caddyfile

@@ -0,0 +1,12 @@
+# Docs: https://caddyserver.com/docs/caddyfile
+0.0.0.0:80
+fastcgi / php-fpm:9000 php
+rewrite {
+    to /index.php?{query}
+}
+browse
+log stdout
+errors stdout
+# 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,22 @@
+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,45 +2,12 @@ version: '2'
 
 services:
 
-### PHP-FPM Container #######################################
-
-    php-fpm:
-        build:
-            context: ./php-fpm
-            dockerfile: Dockerfile-70
-        volumes_from:
-            - application
-        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
         volumes_from:
-            - application
+            - volumes_source
         volumes:
             - ./logs/nginx/:/var/log/nginx
         ports:
@@ -49,12 +16,25 @@ services:
         links:
             - php-fpm
 
+### PHP-FPM Container #######################################
+
+    php-fpm:
+        build:
+            context: ./php-fpm
+            dockerfile: Dockerfile-70
+        volumes_from:
+            - volumes_source
+        expose:
+            - "9000"
+        links:
+            - workspace
+
 ### MySQL Container #########################################
 
     mysql:
         build: ./mysql
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -68,7 +48,7 @@ services:
     postgres:
         build: ./postgres
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "5432:5432"
         environment:
@@ -81,7 +61,7 @@ services:
     mariadb:
         build: ./mariadb
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -100,7 +80,7 @@ services:
         environment:
             - NEO4J_AUTH=homestead:secret
         volumes_from:
-            - data
+            - volumes_data
 
 ### MongoDB Container #######################################
 
@@ -109,14 +89,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 +105,7 @@ services:
     memcached:
         build: ./memcached
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "11211:11211"
         links:
@@ -153,9 +133,48 @@ services:
 ### Workspace Utilities Container ###########################
 
     workspace:
-        build: ./workspace
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_PRESTISSIMO=false
         volumes_from:
-            - application
+            - volumes_source
         tty: true
 
+### Laravel Application Code Container ######################
+
+    volumes_source:
+        build: ./volumes/application
+        volumes:
+            - ../:/var/www/laravel
+
+### Databases Data Container ################################
+
+    volumes_data:
+        build: ./volumes/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
+            
+### Caddy Server Container ##################################
+# Edit the Caddyfile if needed (./caddy/Caddyfile)
+
+    caddy:
+        build: ./caddy
+        volumes_from:
+            - volumes_source
+        ports:
+            - "80:80"
+            - "443:443"
+            - "2015:2015"
+        volumes:
+            - ./caddy/Caddyfile:/etc/Caddyfile
+        links:
+            - php-fpm
+
 ### Add more Containers below ###############################

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

@@ -9,14 +9,24 @@ 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
@@ -33,9 +43,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

@@ -9,14 +9,24 @@ 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
@@ -33,9 +43,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

@@ -9,14 +9,24 @@ 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
@@ -27,19 +37,23 @@ RUN docker-php-ext-install \
 
 # 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
+    && mkdir -p memcached \
+    && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
+    && ( \
+        cd memcached \
+        && phpize \
+        && ./configure \
+        && make -j$(nproc) \
+        && make install \
+    ) \
+    && rm -r memcached \
+    && rm /tmp/memcached.tar.gz \
+    && 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/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

@@ -48,29 +48,16 @@ RUN apt-get update && apt-get install -y --force-yes \
         curl \
         vim \
         nano \
-        nodejs \
-        nodejs-dev \
-        npm
+	pkg-config
 
 # Clean up, to free some space
 RUN apt-get clean
 
-# Install gulp and bower with NPM
-RUN npm install -g \
-    gulp \
-    bower
-
-# 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
-
 # remove load xdebug extension (only load on phpunit command)
 RUN sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini
 
 # Add bin folder of composer to PATH.
-RUN echo "export PATH=${PATH}:/var/www/codeigniter/vendor/bin" >> ~/.bashrc
+RUN echo "export PATH=${PATH}:/var/www/laravel/vendor/bin" >> ~/.bashrc
 
 # Install Composer
 RUN curl -s http://getcomposer.org/installer | php \
@@ -83,6 +70,18 @@ RUN echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/
 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
 
@@ -90,3 +89,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