Merge pull request #515 from cosmospham/master

fix syntax in xdebugPhpFpm

README.md

@@ -69,6 +69,7 @@ Laradock is configured to run Laravel Apps by default, and it can be modified to
 		- [Install Node + YARN](#Install-Yarn)
 		- [Debugging](#debugging)
 		- [Upgrading LaraDock](#upgrading-laradock)
+- [Related Projects](#related-projects)
 - [Help & Questions](#Help)
 
 
@@ -123,6 +124,7 @@ Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL` and `Red
 	- MariaDB
 	- MongoDB
 	- Neo4j
+	- RethinkDB
 - **Cache Engines:**
 	- Redis
 	- Memcached
@@ -138,7 +140,7 @@ Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL` and `Red
 	- Beanstalkd (+ Beanstalkd Console)
 	- RabbitMQ (+ RabbitMQ Console)
 - **Tools:**
-	- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, xDebug, Vim...)
+	- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, xDebug, Envoy, Vim...)
 	- PhpMyAdmin
 	- PgAdmin
 	- ElasticSearch
@@ -618,7 +620,7 @@ By default **PHP-FPM 7.0** is running.
 4 - Finally rebuild the container
 
 ```bash
-docker-compose build php
+docker-compose build php-fpm
 ```
 
 > For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
@@ -1329,6 +1331,72 @@ It should be like this:
 
 2 - Re-build the containers `docker-compose build workspace php-fpm`
 
+<br>
+<a name="Install-Laravel-Envoy"></a>
+### Install Laravel Envoy (Envoy Task Runner)
+
+1 - Open the `docker-compose.yml` file
+<br>
+2 - Search for the `INSTALL_LARAVEL_ENVOY` argument under the Workspace Container
+<br>
+3 - Set it to `true`
+<br>
+
+It should be like this:
+
+```yml
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_LARAVEL_ENVOY=true
+    ...
+```
+
+4 - Re-build the containers `docker-compose build workspace`
+
+####[Laravel Envoy Documentation Here](https://laravel.com/docs/5.3/envoy)
+
+<br>
+<a name="Use-RethinkDB"></a>
+### Use RethinkDB Container
+
+The RethinkDB is an open-source Database for Real-time Web ([RethinkDB](https://rethinkdb.com/)).
+A package ([Laravel RethinkDB](https://github.com/duxet/laravel-rethinkdb)) is being developed and was released a version for Laravel 5.2 (experimental).
+
+1 - Run the RethinkDB Container (`rethinkdb`) with the `docker-compose up` command.
+
+```bash
+docker-compose up -d rethinkdb
+```
+
+2 - Access the RethinkDB Administration Console [http://localhost:8090/#tables](http://localhost:8090/#tables) for create a database called `database`.
+
+3 - Add the RethinkDB configurations to the `config/database.php` configuration file:
+
+```php
+'connections' => [
+	
+	'rethinkdb' => [
+		'name'      => 'rethinkdb',
+		'driver'    => 'rethinkdb',
+		'host'      => env('DB_HOST', 'rethinkdb'),
+		'port'      => env('DB_PORT', 28015),
+		'database'  => env('DB_DATABASE', 'test'),            
+	]
+	
+	// ...
+
+],
+```
+
+4 - Open your Laravel's `.env` file and update the following variables:
+
+- set the `DB_CONNECTION` to your `rethinkdb`.
+- set the `DB_HOST` to `rethinkdb`.
+- set the `DB_PORT` to `28015`.
+- set the `DB_DATABASE` to `database`.
+
 <br>
 <a name="debugging"></a>
 
@@ -1418,9 +1486,24 @@ This little project was built by one man who has a full time job and many respon
 
 #### Read the [Contribution Guidelines](https://github.com/LaraDock/laradock/blob/master/CONTRIBUTING.md).
 
+<br>
+<a name="related-projects"></a>
+## Related Projects
 
+LaraDock related projects:
+* [LaraDock CLI](https://github.com/lorinlee/laradock-cli) by [LorinLee](https://github.com/lorinlee)
+* [LaraDock Env](https://github.com/bagart/laradock_env) by [BAGArt](https://github.com/bagart)
+* [Klaradock](https://github.com/poyhsiao/Klaradock) by [Kim Hsiao](https://github.com/poyhsiao)
+* [Ansible Laradock Kubernetes](https://github.com/sifat-rahim/ansible-laradock-kubernetes) by [Sifat Rahim](https://github.com/sifat-rahim)
 
+These Docker Compose projects have piqued our interest:
+* [MageDock](https://github.com/ojhaujjwal/magedock) by [Ujjwal Ojha](https://github.com/ojhaujjwal)
+* [RubyDev-Dock](https://github.com/scudelletti/rubydev-dock) by [Diogo Scudelletti](https://github.com/scudelletti)
+* [NoDock](https://github.com/Osedea/nodock) by [Osedea](https://github.com/Osedea)
 
+If you want your project listed here, please open an issue.
+
+<br>
 <a name="Help"></a>
 ## Help & Questions
 
@@ -1462,6 +1545,7 @@ For special help with Docker and/or Laravel, you can schedule a live call with t
 - [Matthew Tonkin Dunn](https://github.com/mattythebatty) (mattythebatty)
 - [Zhivitsa Kirill](https://github.com/zhikiri) (zhikiri)
 - [Benmag](https://github.com/benmag)
+- [Cristian Mello](https://github.com/cristiancmello) (cristiancmello)
 
 **Other Contributors & Supporters:**
 

docker-compose.yml

@@ -22,11 +22,14 @@ services:
                 - INSTALL_YARN=false
                 - INSTALL_DRUSH=false
                 - INSTALL_AEROSPIKE_EXTENSION=false
+                - INSTALL_V8JS_EXTENSION=false
                 - COMPOSER_GLOBAL_INSTALL=false
                 - INSTALL_WORKSPACE_SSH=false
+                - INSTALL_LARAVEL_ENVOY=false
                 - PUID=1000
                 - PGID=1000
                 - NODE_VERSION=stable
+                - YARN_VERSION=latest
                 - TZ=UTC
         volumes_from:
             - applications
@@ -44,8 +47,10 @@ services:
             context: ./php-fpm
             args:
                 - INSTALL_XDEBUG=false
+                - INSTALL_SOAP=false
                 - INSTALL_MONGO=false
                 - INSTALL_ZIP_ARCHIVE=false
+                - INSTALL_BCMATH=false
                 - INSTALL_MEMCACHED=false
                 - INSTALL_OPCACHE=false
                 - INSTALL_AEROSPIKE_EXTENSION=false
@@ -185,6 +190,15 @@ services:
             - "27017:27017"
         volumes:
             - mongo:/data/db
+            
+### RethinkDB Container #######################################
+
+    rethinkdb:
+        build: ./rethinkdb
+        ports:
+            - "8090:8080"
+        volumes:
+            - rethinkdb:/data/rethinkdb_data
 
 ### Redis Container #########################################
 
@@ -259,14 +273,12 @@ services:
 
     caddy:
         build: ./caddy
-        volumes_from:
-            - applications
-        volumes:
-            - caddy:/root/.caddy
         ports:
             - "80:80"
             - "443:443"
             - "2015:2015"
+        volumes_from:
+            - applications
         volumes:
             - ./caddy/Caddyfile:/etc/Caddyfile
             - ./logs/caddy:/var/log/caddy
@@ -305,7 +317,7 @@ services:
         build: ./elasticsearch
         volumes:
             - elasticsearch-data:/usr/share/elasticsearch/data
-            - elasticsearch-pkugins:/usr/share/elasticsearch/data
+            - elasticsearch-plugins:/usr/share/elasticsearch/data
         ports:
             - "9200:9200"
             - "9300:9300"
@@ -329,6 +341,8 @@ volumes:
         driver: "local"
     mongo:
         driver: "local"
+    rethinkdb:
+        driver: "local"
     phpmyadmin:
         driver: "local"
     aerospike:
@@ -337,7 +351,7 @@ volumes:
         driver: "local"
     elasticsearch-data:
         driver: "local"
-    elasticsearch-pkugins:
+    elasticsearch-plugins:
         driver: "local"
     sessions:    ## nothing is connected to this (- ./data/sessions:/sessions)
         driver: "local"

mysql/my.cnf

@@ -6,4 +6,4 @@
 [mysql]
 
 [mysqld]
-sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
+sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"

php-fpm/Dockerfile-56

@@ -36,6 +36,18 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 #   - INSTALL_ZIP_ARCHIVE=true
 #
 
+#####################################
+# SOAP:
+#####################################
+
+ARG INSTALL_SOAP=false
+RUN if [ ${INSTALL_SOAP} = true ]; then \
+    # Install the soap extension
+    apt-get -y update && \
+    apt-get -y install libxml2-dev && \ 
+    docker-php-ext-install soap \
+;fi
+
 #####################################
 # xDebug:
 #####################################
@@ -72,6 +84,16 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
     docker-php-ext-enable zip \
 ;fi
 
+#####################################
+# bcmath:
+#####################################
+
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    # Install the bcmath extension
+    docker-php-ext-install bcmath \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################

php-fpm/Dockerfile-70

@@ -37,6 +37,18 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 #   - ...
 #
 
+#####################################
+# SOAP:
+#####################################
+
+ARG INSTALL_SOAP=false
+RUN if [ ${INSTALL_SOAP} = true ]; then \
+    # Install the soap extension
+    apt-get -y update && \
+    apt-get -y install libxml2-dev && \ 
+    docker-php-ext-install soap \
+;fi
+
 #####################################
 # xDebug:
 #####################################
@@ -73,6 +85,16 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
     docker-php-ext-enable zip \
 ;fi
 
+#####################################
+# bcmath:
+#####################################
+
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    # Install the bcmath extension
+    docker-php-ext-install bcmath \
+;fi
+
 #####################################
 # PHP Memcached:
 #####################################

rethinkdb/Dockerfile

@@ -0,0 +1,11 @@
+FROM rethinkdb:latest
+
+MAINTAINER Cristian Mello <cristianc.mello@gmail.com>
+
+VOLUME /data/rethinkdb_data
+
+RUN cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
+
+CMD ["rethinkdb", "--bind", "all"]
+
+EXPOSE 8080

workspace/Dockerfile

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #
 
-FROM laradock/workspace:1.2
+FROM laradock/workspace:1.3
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -46,7 +46,7 @@ ARG PUID=1000
 ARG PGID=1000
 RUN groupadd -g $PGID laradock && \
     useradd -u $PUID -g laradock -m laradock
-    
+
 #####################################
 # Set Timezone
 #####################################
@@ -189,10 +189,16 @@ USER laradock
 
 ARG INSTALL_YARN=false
 ENV INSTALL_YARN ${INSTALL_YARN}
+ARG YARN_VERSION=latest
+ENV YARN_VERSION ${YARN_VERSION}
 
 RUN if [ ${INSTALL_YARN} = true ]; then \
     [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \
-    curl -o- -L https://yarnpkg.com/install.sh | bash && \
+    if [ ${YARN_VERSION} = "latest" ]; then \
+        curl -o- -L https://yarnpkg.com/install.sh | bash; \
+    else \
+        curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version ${YARN_VERSION}; \
+    fi && \
     echo "" >> ~/.bashrc && \
     echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \
 ;fi
@@ -235,6 +241,23 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \
     rm /etc/php/7.0/cli/conf.d/aerospike.ini \
 ;fi
 
+#####################################
+# PHP V8JS:
+#####################################
+USER root
+
+ARG INSTALL_V8JS_EXTENSION=false
+ENV INSTALL_V8JS_EXTENSION ${INSTALL_V8JS_EXTENSION}
+
+RUN if [ ${INSTALL_V8JS_EXTENSION} = true ]; then \
+    # Install the php V8JS extension
+    add-apt-repository -y ppa:pinepain/libv8-5.4 \
+    && apt-get update \
+    && apt-get install -y php-dev php-pear libv8-5.4 \
+    && pecl install v8js \
+    && echo "extension=v8js.so" >> /etc/php/7.0/cli/php.ini \
+;fi
+
 #####################################
 # Non-root user : PHPUnit path
 #####################################
@@ -245,6 +268,29 @@ USER laradock
 RUN echo "" >> ~/.bashrc && \
     echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc
 
+#####################################
+# Laravel Artisan Alias
+#####################################
+USER root
+
+RUN echo "" >> ~/.bashrc && \
+    echo 'alias art="php artisan"' >> ~/.bashrc
+
+#####################################
+# Laravel Envoy:
+#####################################
+USER laradock
+
+ARG INSTALL_LARAVEL_ENVOY=true
+ENV INSTALL_LARAVEL_ENVOY ${INSTALL_LARAVEL_ENVOY}
+
+RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
+    # Install the Laravel Envoy
+    echo "" >> ~/.bashrc && \
+    echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc \
+    && composer global require "laravel/envoy=~1.0" \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

xdebugPhpFpm

@@ -4,7 +4,7 @@
 
 
 # Grab full name of php-fpm container
-PHP_FPM_CONTAINER=$(docker-compose ps | grep php-fpm | cut -d" " -f 1)
+PHP_FPM_CONTAINER=$(docker-compose ps | grep php-fpm | cut -d " " -f 1)
 
 
 # Grab OS type