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

update base tags
enable remote_connect_back instead of defining remote host in xdebug
2017-12-17 21:35:31 +01:00 · 2017-12-17 21:31:37 +01:00 · 2017-12-17 21:31:05 +01:00 · 2017-12-17 21:15:12 +01:00 · 2017-12-17 21:14:56 +01:00 · 2017-12-15 09:23:24 -03:00
29 changed files with 172 additions and 73 deletions
--- a/.github/README-zh.md
+++ b/.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>
--- a/.github/README.md
+++ b/.github/README.md
@ -6,7 +6,7 @@

 <p align="center">
   <a href="https://travis-ci.org/laradock/laradock"><img src="https://travis-ci.org/laradock/laradock.svg?branch=master" alt="Build status"></a>
-   <a href="https://github.com/laradock/laradock/stargazers"><img src="https://img.shields.io/github/stars/laradock/laradock.svg" alt="GitHub stars"></a>
+   <a href="https://github.com/laradock/laradock/stargazers"><a href="#backers" alt="sponsors on Open Collective"><img src="https://opencollective.com/laradock/backers/badge.svg" /></a> <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/laradock/sponsors/badge.svg" /></a> <img src="https://img.shields.io/github/stars/laradock/laradock.svg" alt="GitHub stars"></a>
   <a href="https://github.com/laradock/laradock/network"><img src="https://img.shields.io/github/forks/laradock/laradock.svg" alt="GitHub forks"></a>
   <a href="https://github.com/laradock/laradock/issues"><img src="https://img.shields.io/github/issues/laradock/laradock.svg" alt="GitHub issues"></a>
   <a href="https://raw.githubusercontent.com/laradock/laradock/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub license"></a>
@ -31,10 +31,27 @@

 ## Sponsors

+Support this project by becoming a sponsor. 
+
+Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
+
 <a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
 </a>

+
+<a href="https://opencollective.com/laradock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg"></a>
+
+
 ## Contributors

 #### Core contributors:
@ -53,7 +70,8 @@
 - Join us, by submitting 20 useful PR's.

 #### Awesome contributors:
- See full list [here](https://github.com/apiato/apiato/graphs/contributors).
+
+<a href="https://github.com/laradock/laradock/graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890" /></a>


 ## Donations
@ -65,6 +83,10 @@ Donate directly via [Paypal](https://www.paypal.me/mzalt)

 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/mzalt) 

+or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
+
+<a href="https://opencollective.com/laradock#backers" target="_blank"><img src="https://opencollective.com/laradock/backers.svg?width=890"></a>
+
 or show your support via [Beerpay](https://beerpay.io/laradock/laradock) 

 [![Beerpay](https://beerpay.io/laradock/laradock/badge.svg?style=flat)](https://beerpay.io/laradock/laradock)
--- a/.travis.yml
+++ b/.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:
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/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;
 ```


--- a/DOCUMENTATION/content/getting-started/index.md
+++ b/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.**

@ -162,6 +163,7 @@ cp env-example .env

 You can edit the `.env` file to chose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.

+Depending on the host's operating system you may need to change the value given to `COMPOSE_FILE`. When you are running Laradock on Mac OS the correct file separator to use is `:`. When running Laradock from a Windows environment multiple files must be separated with `;`.

 2 - Build the enviroment and run it using `docker-compose`

@ -212,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/`.
--- a/DOCUMENTATION/content/guides/index.md
+++ b/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

--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@ -118,12 +118,32 @@ If you can't find your Software in the list, build it yourself and submit it. Co

 ## Sponsors

+
+
+
+
+Support this project by becoming a sponsor. 
+
+Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
+
+<a href="https://opencollective.com/laradock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg"></a>
+
 <a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
 </a>



+
 <a name="what-is-docker"></a>
 ## What is Docker?

@ -190,6 +210,10 @@ Donate directly via [Paypal](https://www.paypal.me/mzalt)

 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/mzalt) 

+or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
+
+<a href="https://opencollective.com/laradock#backers" target="_blank"><img src="https://opencollective.com/laradock/backers.svg?width=890"></a>
+
 or show your support via [Beerpay](https://beerpay.io/laradock/laradock) 

 [![Beerpay](https://beerpay.io/laradock/laradock/badge.svg?style=flat)](https://beerpay.io/laradock/laradock)
--- a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
+++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
@ -21,7 +21,6 @@
    <div class="button button-github" role="button" aria-label="GitHub">
        <a style="padding: 0px; font-size:40px" href="https://github.com/{{ . }}" title="@{{ . }} on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
    </div>
-      <p style="font-size: 18px; padding: 8px">Github</p>
    {{ end }}
    
    <!-- TODO: disabled until Hugo supports the generation of a content index natively 
--- a/apache2/sites/default.apache.conf
+++ b/apache2/sites/default.apache.conf
@ -1,5 +1,5 @@
 <VirtualHost *:80>
-  ServerName laradock.dev
+  ServerName laradock.test
  DocumentRoot /var/www/
  Options Indexes FollowSymLinks

--- a/apache2/sites/sample.conf.example
+++ b/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

--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@ -1,17 +1,15 @@
-FROM golang
+FROM zuohuadong/caddy:alpine
+

 MAINTAINER Huadong Zuo <admin@zuohuadong.cn>

-ARG plugins="git"
+ARG plugins="cors"

-## If you come frome china, please ues it.
+## ARG plugins="cors cgi cloudflare azure linode"

-# RUN echo "172.217.6.127 golang.org" >> /etc/hosts

-RUN go get github.com/abiosoft/caddyplug/caddyplug \
-    && caddyplug install-caddy \
-    && caddyplug install git
-RUN caddy --version
+RUN caddyplug install ${plugins}
+    

 EXPOSE 80 443 2015

--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@ -0,0 +1,9 @@
+version: "2"
+
+services:
+
+### Applications Code Container #############################
+
+    applications:
+      volumes:
+        - ${APPLICATION}:/var/www
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,8 +6,6 @@ services:

    applications:
      image: tianon/true
-      volumes:
-        - ${APPLICATION}:/var/www

 ### Workspace Utilities Container ###########################

@ -200,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:
@ -208,6 +207,7 @@ services:
        - MINIO_SECRET_KEY=secretkey
      networks:
        - frontend
+        - backend

 ### MySQL Container #########################################

--- a/docker-sync.yml
+++ b/docker-sync.yml
@ -1,7 +1,7 @@
 version: "2"

 options:
-  verbose: true
+  verbose: false
 syncs:
  applications-docker-sync: # name of the intermediary sync volume
    compose-dev-file-path: 'docker-compose.sync.yml' # docker-compose override file
--- a/14
+++ b/14
@ -22,6 +22,14 @@ PHP_INTERPRETER=php-fpm

 DATA_SAVE_PATH=~/.laradock/data

+### Docker compose files ###############################################################################################
+# Select which docker-compose files to include.
+# If using docker-sync. Set the value to: docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
+# Change the separator from : to ; on Windows
+
+COMPOSE_PATH_SEPARATOR=:
+COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
+
 ### Docker Host IP #####################################################################################################
 # Enter your Docker Host IP (will be appended to /etc/hosts). Default is `10.0.75.1`

@ -37,6 +45,11 @@ PHP_IDE_CONFIG=serverName=laradock

 COMPOSE_CONVERT_WINDOWS_PATHS=1

+### Environment ########################################################################################################
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+CHANGE_SOURCE=false
+
 ########################################################################################################################

 ###########################################################
@ -95,7 +108,6 @@ PHP_FPM_INSTALL_EXIF=false
 PHP_FPM_INSTALL_AEROSPIKE=false
 PHP_FPM_INSTALL_MYSQLI=false
 PHP_FPM_INSTALL_PGSQL=false
-PHP_FPM_INSTALL_POSTGRES=false
 PHP_FPM_INSTALL_TOKENIZER=false
 PHP_FPM_INSTALL_INTL=false
 PHP_FPM_INSTALL_GHOSTSCRIPT=false
--- a/hhvm/Dockerfile
+++ b/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 \
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@ -4,14 +4,22 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

 ADD nginx.conf /etc/nginx/

-ARG PHP_UPSTREAM_CONTAINER=php-fpm
-ARG PHP_UPSTREAM_PORT=9000
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+;fi

 RUN apk update \
    && apk upgrade \
    && apk add --no-cache bash \
    && adduser -D -H -u 1000 -s /bin/bash www-data

+ARG PHP_UPSTREAM_CONTAINER=php-fpm
+ARG PHP_UPSTREAM_PORT=9000
+
 # Set upstream conf and remove the default conf
 RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf \
    && rm /etc/nginx/conf.d/default.conf
--- a/nginx/sites/app.conf.example
+++ b/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;

--- a/nginx/sites/laravel.conf.example
+++ b/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;

--- a/nginx/sites/symfony.conf.example
+++ b/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;

--- a/php-fpm/Dockerfile-56
+++ b/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 \
    && ( \
--- a/php-fpm/Dockerfile-70
+++ b/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>

--- a/php-fpm/Dockerfile-71
+++ b/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>

--- a/php-fpm/xdebug.ini
+++ b/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
+
--- a/sync.sh
+++ b/sync.sh
@ -59,11 +59,11 @@ if [ "$1" == "up" ] ; then

    print_style "Initializing Docker Compose\n" "info"
    shift # removing first argument
-    docker-compose -f docker-compose.yml -f docker-compose.sync.yml up -d ${@}
+    docker-compose up -d ${@}

 elif [ "$1" == "down" ]; then
    print_style "Stopping Docker Compose\n" "info"
-    docker-compose down
+    docker-compose stop

    print_style "Stopping Docker Sync\n" "info"
    docker-sync stop
@ -86,4 +86,4 @@ else
    print_style "Invalid arguments.\n" "danger"
    display_options
    exit 1
-fi
+fi
--- a/workspace/Dockerfile-56
+++ b/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 \
    && ( \
--- a/workspace/Dockerfile-70
+++ b/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>

--- a/workspace/Dockerfile-71
+++ b/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>

@ -54,9 +54,7 @@ ENV PUID ${PUID}
 ENV PGID ${PGID}

 RUN groupadd -g ${PGID} laradock && \
-    useradd -u ${PUID} -g laradock -m laradock && \
-    apt-get update -yqq && \
-    apt-get install -y python2.7
+    useradd -u ${PUID} -g laradock -m laradock

 #####################################
 # SOAP:
@ -686,8 +684,7 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
 # Clean up
 USER root
 RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-    npm config set python /usr/bin/python2.7
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 # Set default work directory
 WORKDIR /var/www
--- a/workspace/xdebug.ini
+++ b/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
+
Author	SHA1	Message	Date
Mahmoud Zalt	ad3698670b	replace .dev with .test to avoid issues with the new google chrome	2017-12-17 21:35:31 +01:00
Mahmoud Zalt	71cc109334	update base tags	2017-12-17 21:31:37 +01:00
Mahmoud Zalt	0d804cd29a	enable remote_connect_back instead of defining remote host in xdebug and modify the default var display	2017-12-17 21:31:05 +01:00
Mahmoud Zalt	3fcebd49e7	Merge pull request #1311 from KoRiGaN/master Give minio access to backend	2017-12-17 21:15:12 +01:00
Mahmoud Zalt	86eccdb962	Merge pull request #1312 from jonaselan/patch-1 Update index.md	2017-12-17 21:14:56 +01:00
Jonas Elan	0f46659172	fix misspelled	2017-12-15 09:23:24 -03:00
Jonas Elan	017fcf188b	Update index.md Google Chrome is releasing v63 which now forces all .dev domains to use HTTPS. Me and my co-workers had problems with this, so I do not want this to happen to others.	2017-12-13 18:22:18 -03:00
KoRiGaN	63c69231f7	Give minio access to backend Add volume to persist minio configuration Modify minio data volume to use the standard DATA_SAVE_PATH	2017-12-13 17:45:15 +01:00
Mahmoud Zalt	4730ed1b78	Merge pull request #1308 from gorjan-mishevski/patch-1 Update index.md	2017-12-11 18:10:05 +01:00
Yu-Lung Shao (Allen)	c21c6760ac	Merge pull request #1309 from bestlong/refactoring-travis Refactor travis.yml	2017-12-11 17:00:53 +08:00
Shao Yu Lung	1c194f5c87	Merge duplicate services build job	2017-12-11 14:25:42 +08:00
Shao Yu Lung	81b34a72eb	ignore aws service	2017-12-11 12:01:23 +08:00
Gorjan Mishevski	fde265ed6a	Update index.md Syntax typo error fix.	2017-12-11 01:01:15 +01:00
Shao Yu Lung	64029d9270	fix sed expression unknown option	2017-12-10 23:48:53 +08:00
Shao Yu Lung	407c08017d	add new services	2017-12-10 23:23:03 +08:00
Shao Yu Lung	2156139b5a	merge independent services	2017-12-10 23:21:09 +08:00
Yu-Lung Shao (Allen)	e1ccd84c16	Merge pull request #1307 from bestlong/fix-php-worker-build-fail Fix php-worker build fail	2017-12-10 20:59:53 +08:00
Shao Yu Lung	d139b6bc2e	fix php-worker build fail	2017-12-10 18:27:30 +08:00
Yu-Lung Shao (Allen)	5e10abd536	Merge pull request #1306 from bestlong/fix-hhvm-build-fail fix install hhvm package cannot be authenticated	2017-12-10 18:19:06 +08:00
Shao Yu Lung	c6a8500c44	fix install hhvm package cannot be authenticated	2017-12-10 17:43:30 +08:00
Yu-Lung Shao (Allen)	b981168111	Merge pull request #1305 from bestlong/fix-workspace-php-56-build-fail Fix workspace php56 build fail	2017-12-10 17:33:15 +08:00
Shao Yu Lung	cd1c9c0d44	fix aerospike build fail	2017-12-10 16:13:39 +08:00
Mahmoud Zalt	8e32b93264	Merge pull request #1304 from bestlong/fix-php-fpm-56-aerospike-build-fail fix aerospike build fail	2017-12-10 09:00:16 +01:00
Shao Yu Lung	a2ae141a75	fix aerospike build fail	2017-12-10 15:10:41 +08:00
Mahmoud Zalt	f22ceb71ab	Merge pull request #1298 from nm777/bug/issue-1296-php56-ldap-in-workspace Add LDAP support to PHP 5.6 workspace	2017-12-06 21:36:32 +01:00
Nate Morris	6ea86fbce3	Add LDAP support to PHP 5.6 workspace Issue #1296: PHP 7.0 and 7.1 workspaces support adding the PHP LDAP module. The PHP 5.6 workspace file seems to have missed this for some reason.	2017-12-05 12:52:35 -06:00
Mahmoud Zalt	dec08ec2b1	Merge pull request #1295 from Rhymond/patch-2 LInk is not working	2017-12-05 02:31:28 +01:00
Raymond	98fba83331	LInk is not working	2017-12-04 09:38:57 +00:00
Mahmoud Zalt	694b39ddf4	Merge pull request #1293 from Rhymond/patch-1 Compatibility for COMPOSE_FILE	2017-12-04 08:51:32 +01:00
Mahmoud Zalt	d0167475ba	Merge pull request #1279 from scaule/scaule-patch Don't use docker-compose down to stop containers	2017-12-04 08:38:29 +01:00
Mahmoud Zalt	3bdab382ea	Merge pull request #1276 from scaule/patch-#1275 #1275 Fix memory leaks in docker-sync with verbose true	2017-12-04 08:36:37 +01:00
Mahmoud Zalt	80f6e8b60c	Merge pull request #1273 from EnnioSimoes/master adding '\' to the Dockerfile nginx statement	2017-12-04 08:36:03 +01:00
Mahmoud Zalt	ba61566f28	Merge pull request #1269 from francoisfaubert/master Clarified how to split multiple docker-compose files on Windows	2017-12-04 08:35:01 +01:00
Mahmoud Zalt	9ae10d32ce	Merge pull request #1233 from zuohuadong/patch-18 Remove duplicate configuration	2017-12-04 08:34:17 +01:00
Raymond	cf136f891b	Windows compatibility COMPOSE_PATH_SEPARATOR If set, the value of the COMPOSE_FILE environment variable will be separated using this character as path separator.	2017-12-03 23:04:20 +00:00
Caule Simon	59dff53176	Don't use docker-compose down to stop containers This delete containers and volume too. Use docker-compose stop who only stop containers	2017-11-28 15:33:27 +01:00
Caule Simon	34267ffc4d	#1275 Fix memory leaks in docker-sync with verbose true	2017-11-27 12:00:05 +01:00
Ennio Simões	57918b69a7	adding '\' to the Dockerfile nginx statement	2017-11-26 17:30:32 -02:00
francoisfaubert	c11658559a	Updated the documentation to illustrate my proposition	2017-11-23 14:21:38 -05:00
francoisfaubert	47c74d1334	Added clarification on how to split multiple docker-compose files within COMPOSE_FILE on Windows	2017-11-23 14:02:56 -05:00
Mahmoud Zalt	e779bf96ab	reorder some keys in the .env for easier modification	2017-11-23 20:52:42 +02:00
Mahmoud Zalt	06ce5ca222	add open collective to the documentation	2017-11-23 20:41:41 +02:00
Mahmoud Zalt	c06c28aa04	Merge branch 'opencollective-opencollective' * opencollective-opencollective: add open collective to the readme Update README.md	2017-11-23 20:30:27 +02:00
Mahmoud Zalt	c1e80e3af4	add open collective to the readme	2017-11-23 20:30:10 +02:00
Mahmoud Zalt	a7c9232193	Merge branch 'opencollective' of https://github.com/opencollective/laradock into opencollective-opencollective * 'opencollective' of https://github.com/opencollective/laradock: Update README.md	2017-11-23 20:16:54 +02:00
Mahmoud Zalt	265bc13917	Merge pull request #1251 from mouyong/master Set environment to change source.	2017-11-23 20:12:11 +02:00
牟勇	8d410e9c82	merge upstream	2017-11-23 13:42:33 +08:00
Aseem Sood	f56a585ab2	Update README.md	2017-11-22 17:52:45 -05:00
Mahmoud Zalt	9b8d4806a8	Merge pull request #1265 from jeff-h/master1 Specifying included docker-compose files in the .env is more flexible	2017-11-22 20:15:07 +02:00
Jeff	73b95357ac	Specifying included docker-compose files in the .env is more flexible than hardcoding in the shell script.	2017-11-22 10:48:22 +13:00
Mahmoud Zalt	65a8bbc6a4	Merge pull request #1262 from jeff-h/issue-171 Fixes #353 and allows easier dev & prod environments	2017-11-21 22:56:04 +02:00
Mahmoud Zalt	7c1f3060bf	Merge pull request #1257 from nellonican/hotfix Remove python installation from Dockerfile-71	2017-11-21 22:55:33 +02:00
Mahmoud Zalt	45e1ecf3c0	Merge pull request #1256 from ricardoseriani/remove-the-github-paragraph-on-header Remove the github paragraph on header	2017-11-21 22:54:54 +02:00
Mahmoud Zalt	c6b1eb016d	Merge pull request #1255 from zuohuadong/patch-23 Remove useless...	2017-11-21 22:53:32 +02:00
Mahmoud Zalt	c5005f54f7	Merge pull request #1254 from zuohuadong/patch-22 add git & Chinese users friendly.	2017-11-21 22:53:19 +02:00
Jeff	cf5b1af31a	Fixes #353 and allows easier dev & prod environments by splitting dev-specific configuration into a separate docker-compose.	2017-11-21 09:59:11 +13:00
Thorvald Falkenburg	8dea201b68	Remove python installation from Dockerfile-71 Python can be installed by using the WORKSPACE_INSTALL_PYTHON variable in the .env file. Fixes #1238	2017-11-16 21:31:43 +01:00
Ricardo Seriani	50a3e24db8	Remove the github paragraph on header Remove the github paragraph on header, since it already has a link to github using aria to accessibility	2017-11-16 12:13:00 -02:00
huadong zuo	9835a20863	Remove useless... Remove useless...	2017-11-15 13:05:26 +08:00
huadong zuo	5bcb99dfb9	add git & Chinese users friendly. China can not access golang.org.	2017-11-15 13:00:57 +08:00
牟勇	a99281cda8	Change application source from dl-cdn.alpinelinux.org to aliyun source	2017-11-14 21:03:19 +08:00
牟勇	1342b696ea	Merge branch 'master' of https://github.com/laradock/laradock	2017-11-14 20:57:52 +08:00
zuohuadong	fd5bb38a8c	Update env-example Remove duplicate configuration	2017-11-07 10:54:19 +08:00
蜗牛	025a339062	change application source #397 # fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source.	2017-02-15 10:20:18 +08:00