replace .dev with .test to avoid issues with the new google chrome

and modify the default var display

.github/README-zh.md

@@ -669,19 +669,19 @@ PHP-CLI 安装在 Workspace 容器，改变 PHP-CLI 版本你需要编辑 `works
 <a name="Use-custom-Domain"></a>
 ### 使用自定义域名 (替换 Docker 的 IP)
 
-假定你的自定义域名是 `laravel.dev`
+假定你的自定义域名是 `laravel.test`
 
-1 - 打开 `/etc/hosts` 文件添加以下内容，映射你的 localhost 地址 `127.0.0.1` 为 `laravel.dev` 域名
+1 - 打开 `/etc/hosts` 文件添加以下内容，映射你的 localhost 地址 `127.0.0.1` 为 `laravel.test` 域名
 ```bash
-127.0.0.1    laravel.dev
+127.0.0.1    laravel.test
 ```
 
-2 - 打开你的浏览器访问 `{http://laravel.dev}`
+2 - 打开你的浏览器访问 `{http://laravel.test}`
 
 你可以在 nginx 配置文件自定义服务器名称,如下:
 
 ```conf
-server_name laravel.dev;
+server_name laravel.test;
 ```
 
 <a name="Enable-Global-Composer-Build-Install"></a>

.github/README.md

@@ -71,7 +71,7 @@ Your logo will show up on the [github repository](https://github.com/laradock/la
 
 #### Awesome contributors:
 
-<a href="graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890" /></a>
+<a href="https://github.com/laradock/laradock/graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890" /></a>
 
 
 ## Donations

.travis.yml

@@ -7,10 +7,6 @@ env:
   matrix:
     - HUGO_VERSION=0.20.2
 
-    - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-    - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-    - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-
     - PHP_VERSION=56 BUILD_SERVICE=workspace
     - PHP_VERSION=70 BUILD_SERVICE=workspace
     - PHP_VERSION=71 BUILD_SERVICE=workspace
@@ -19,9 +15,11 @@ env:
     - PHP_VERSION=70 BUILD_SERVICE=php-fpm
     - PHP_VERSION=71 BUILD_SERVICE=php-fpm
 
-    - PHP_VERSION=56 BUILD_SERVICE="php-worker hhvm"
-    - PHP_VERSION=70 BUILD_SERVICE="php-worker hhvm"
-    - PHP_VERSION=71 BUILD_SERVICE="php-worker hhvm"
+    - PHP_VERSION=hhvm BUILD_SERVICE=hhvm
+
+    # - PHP_VERSION=56 BUILD_SERVICE=php-worker
+    - PHP_VERSION=70 BUILD_SERVICE=php-worker
+    - PHP_VERSION=71 BUILD_SERVICE=php-worker
 
     - PHP_VERSION=56 BUILD_SERVICE=mssql
     - PHP_VERSION=70 BUILD_SERVICE=mssql
@@ -35,9 +33,11 @@ env:
     - PHP_VERSION=70 BUILD_SERVICE=aerospike
     - PHP_VERSION=71 BUILD_SERVICE=aerospike
 
-    - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
-    - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
-    - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
+    - PHP_VERSION=NA BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
+    - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin"
+    - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
+    - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server"
+    # - PHP_VERSION=NA BUILD_SERVICE="aws"
 
 # Installing a newer Docker version
 before_install:

DOCUMENTATION/content/documentation/index.md

@@ -1002,7 +1002,7 @@ To install CodeIgniter 3 on Laradock all you have to do is the following simple
 
 4 - Run `docker-compose restart` if the container was already running, before the step above.
 
-5 - Visit `symfony.dev`
+5 - Visit `symfony.test`
 
 <br>
 <a name="Misc"></a>
@@ -1167,21 +1167,21 @@ If you need <a href="#MySQL-access-from-host">MySQL access from your host</a>, d
 <a name="Use-custom-Domain"></a>
 ## Use custom Domain (instead of the Docker IP)
 
-Assuming your custom domain is `laravel.dev`
+Assuming your custom domain is `laravel.test`
 
-1 - Open your `/etc/hosts` file and map your localhost address `127.0.0.1` to the `laravel.dev` domain, by adding the following:
+1 - Open your `/etc/hosts` file and map your localhost address `127.0.0.1` to the `laravel.test` domain, by adding the following:
 
 ```bash
-127.0.0.1    laravel.dev
+127.0.0.1    laravel.test
 ```
 
-2 - Open your browser and visit `{http://laravel.dev}`
+2 - Open your browser and visit `{http://laravel.test}`
 
 
 Optionally you can define the server name in the NGINX configuration file, like this:
 
 ```conf
-server_name laravel.dev;
+server_name laravel.test;
 ```
 
 

DOCUMENTATION/content/getting-started/index.md

@@ -121,10 +121,11 @@ You can rename the config files, project folders and domains as you like, just m
 4 - Add the domains to the **hosts** files.
 
 ```
-127.0.0.1  project-1.dev
-127.0.0.1  project-2.dev
+127.0.0.1  project-1.test
+127.0.0.1  project-2.test
 ...
 ```
+If you use Chrome 63 or above for development, don't use `.dev`. [Why?](https://laravel-news.com/chrome-63-now-forces-dev-domains-https). Instead use `.localhost`, `.invalid`, `.test`, or `.example`.
 
 > **Now jump to the [Usage](#Usage) section.**
 
@@ -213,4 +214,4 @@ DB_HOST=mysql
 *If you want to install Laravel as PHP project, see [How to Install Laravel in a Docker Container](#Install-Laravel).*
 
 <br>
-5 - Open your browser and visit your localhost address `http://localhost/`. If you followed the multiple projects setup, you can visit `http://project-1.dev/` and `http://project-2.dev/`.
+5 - Open your browser and visit your localhost address `http://localhost/`. If you followed the multiple projects setup, you can visit `http://project-1.test/` and `http://project-2.test/`.

DOCUMENTATION/content/guides/index.md

@@ -358,7 +358,7 @@ Here are a few things I use to clean things up.
 ```
 dclean() {
     processes=`docker ps -q -f status=exited`
-    if [ -n "$processes" ]; thend
+    if [ -n "$processes" ]; then
       docker rm $processes
     fi
 

apache2/sites/default.apache.conf

@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-  ServerName laradock.dev
+  ServerName laradock.test
   DocumentRoot /var/www/
   Options Indexes FollowSymLinks
 

apache2/sites/sample.conf.example

@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-  ServerName sample.dev
+  ServerName sample.test
   DocumentRoot /var/www/sample/public/
   Options Indexes FollowSymLinks
 

docker-compose.yml

@@ -198,7 +198,8 @@ services:
     minio:
       build: ./minio
       volumes:
-        - minio:/export
+        - ${DATA_SAVE_PATH}/minio/data:/export
+        - ${DATA_SAVE_PATH}/minio/config:/root/.minio
       ports:
         - "${MINIO_PORT}:9000"
       environment:
@@ -206,6 +207,7 @@ services:
         - MINIO_SECRET_KEY=secretkey
       networks:
         - frontend
+        - backend
 
 ### MySQL Container #########################################
 

hhvm/Dockerfile

@@ -5,7 +5,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
 
 RUN apt-get update -y \
-    && apt-get install -y software-properties-common \
+    && apt-get install -y software-properties-common wget \
+    && wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add - \
     && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \
     && apt-get update -y \
     && apt-get install -y hhvm \

nginx/sites/app.conf.example

@@ -3,7 +3,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name app.dev;
+    server_name app.test;
     root /var/www/app;
     index index.php index.html index.htm;
 

nginx/sites/laravel.conf.example

@@ -3,7 +3,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name laravel.dev;
+    server_name laravel.test;
     root /var/www/laravel/public;
     index index.php index.html index.htm;
 

nginx/sites/symfony.conf.example

@@ -3,7 +3,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name symfony.dev;
+    server_name symfony.test;
     root /var/www/projects/symfony/web;
     index index.php index.html index.htm;
 

php-fpm/Dockerfile-56

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/php-fpm:1.4-56
+FROM laradock/php-fpm:2.0-56
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -187,7 +187,7 @@ ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
 COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
 RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
     # Install the php aerospike extension
-    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
+    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz" \
     && mkdir -p aerospike-client-php \
     && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
     && ( \

php-fpm/Dockerfile-70

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/php-fpm:1.4-70
+FROM laradock/php-fpm:2.0-70
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

php-fpm/Dockerfile-71

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/php-fpm:1.4-71
+FROM laradock/php-fpm:2.0-71
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

php-fpm/xdebug.ini

@@ -1,13 +1,20 @@
 ; NOTE: The actual debug.so extention is NOT SET HERE but rather (/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini)
 
+; xdebug.remote_host=dockerhost
+xdebug.remote_connect_back=1
+xdebug.remote_port=9000
+xdebug.idekey=PHPSTORM
+
 xdebug.remote_autostart=0
 xdebug.remote_enable=0
-xdebug.remote_connect_back=0
 xdebug.cli_color=0
 xdebug.profiler_enable=0
+xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
+
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
 
-xdebug.remote_port=9000
-xdebug.remote_host=dockerhost
-xdebug.idekey=PHPSTORM
+xdebug.var_display_max_children=-1
+xdebug.var_display_max_data=-1
+xdebug.var_display_max_depth=-1
+

workspace/Dockerfile-56

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/workspace:1.9-56
+FROM laradock/workspace:2.0-56
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -72,6 +72,19 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \
   apt-get -y install libxml2-dev php5.6-soap \
 ;fi
 
+#####################################
+# LDAP:
+#####################################
+
+ARG INSTALL_LDAP=false
+ENV INSTALL_LDAP ${INSTALL_LDAP}
+
+RUN if [ ${INSTALL_LDAP} = true ]; then \
+    apt-get update -yqq && \
+    apt-get install -y libldap2-dev && \
+    apt-get install -y php5.6-ldap \
+;fi
+
 #####################################
 # IMAP:
 #####################################
@@ -342,7 +355,7 @@ COPY ./aerospike.ini /etc/php/5.6/cli/conf.d/aerospike.ini
 
 RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
     # Install the php aerospike extension
-    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
+    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz" \
     && mkdir -p aerospike-client-php \
     && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
     && ( \

workspace/Dockerfile-70

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/workspace:1.9-70
+FROM laradock/workspace:2.0-70
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

workspace/Dockerfile-71

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/workspace:1.9-71
+FROM laradock/workspace:2.0-71
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

workspace/xdebug.ini

@@ -1,13 +1,20 @@
 ; NOTE: The actual debug.so extention is NOT SET HERE but rather (/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini)
 
+; xdebug.remote_host=dockerhost
+xdebug.remote_connect_back=1
+xdebug.remote_port=9000
+xdebug.idekey=PHPSTORM
+
 xdebug.remote_autostart=0
 xdebug.remote_enable=0
-xdebug.remote_connect_back=0
 xdebug.cli_color=0
 xdebug.profiler_enable=0
+xdebug.profiler_output_dir="~/xdebug/phpstorm/tmp/profiling"
+
 xdebug.remote_handler=dbgp
 xdebug.remote_mode=req
 
-xdebug.remote_port=9000
-xdebug.remote_host=dockerhost
-xdebug.idekey=PHPSTORM
+xdebug.var_display_max_children=-1
+xdebug.var_display_max_data=-1
+xdebug.var_display_max_depth=-1
+