Merge pull request #1240 from JeromeDesseaux/master

solving python issue when using INSTALL_NODE=true and VueJS with Laravel.

.github/README.md

@@ -29,8 +29,15 @@
 </p>
 
 
-## Credits
+## Sponsors
 
+<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>
+
+## Contributors
+
+#### Core contributors:
 - [Mahmoud Zalt](https://github.com/Mahmoudz) @mahmoudz | [Twitter](https://twitter.com/Mahmoud_Zalt) | [Site](http://zalt.me)
 - [Bo-Yi Wu](https://github.com/appleboy) @appleboy | [Twitter](https://twitter.com/appleboy)
 - [Philippe Trépanier](https://github.com/philtrep) @philtrep
@@ -42,7 +49,26 @@
 - [Yu-Lung Shao (Allen)](https://github.com/bestlong) @bestlong
 - [Milan Urukalo](https://github.com/urukalo) @urukalo
 - [Vince Chu](https://github.com/vwchu) @vwchu
-- Join Us.
+- [Huadong Zuo](https://github.com/zuohuadong) @zuohuadong
+- Join us, by submitting 20 useful PR's.
+
+#### Awesome contributors:
+- See full list [here](https://github.com/apiato/apiato/graphs/contributors).
+
+
+## Donations
+
+> Help keeping the project development going, by [contributing](http://laradock.io/contributing) or donating a little. 
+> Thanks in advance.
+
+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 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)
+
 
 ## License
 

.travis.yml

@@ -5,6 +5,8 @@ services:
 
 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"
@@ -37,8 +39,6 @@ env:
     - 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"
 
-    - HUGO_VERSION=0.20.2
-
 # Installing a newer Docker version
 before_install:
   - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -

DOCUMENTATION/content/documentation/index.md

@@ -541,11 +541,18 @@ b) add a new service container by simply copy-paste this section below PHP-FPM c
 ```yaml
     php-worker:
       build:
-        context: ./php-fpm
+        context: ./php-worker
-        dockerfile: Dockerfile-70 # or Dockerfile-56, choose your PHP-FPM container setting
+        dockerfile: "Dockerfile-${PHP_VERSION}" #Dockerfile-71 or #Dockerfile-70 available
+        args:
+          - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL} #Optionally install PGSQL PHP drivers
       volumes_from:
         - applications
-      command: php artisan queue:work
+      depends_on:
+        - workspace
+      extra_hosts:
+        - "dockerhost:${DOCKER_HOST_IP}"
+      networks:
+        - backend
 ```
 2 - Start everything up
 
@@ -567,13 +574,15 @@ docker-compose up -d php-worker
 docker-compose up -d redis
 ```
 
+> To execute redis commands, enter the redis container first `docker-compose exec redis bash` then enter the `redis-cli`.
+
 2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to `redis`
 
 ```env
 REDIS_HOST=redis
 ```
 
-If you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database configuration file `config/database.php` and replace the default `127.0.0.1` IP with `redis` for Redis like this:
+If you're using Laravel, and you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database configuration file `config/database.php` and replace the default `127.0.0.1` IP with `redis` for Redis like this:
 
 ```php
 'redis' => [
@@ -813,19 +822,20 @@ docker-compose up -d elasticsearch
 
 2 - Open your browser and visit the localhost on port **9200**:  `http://localhost:9200`
 
+> The default username is `user` and the default password is `changeme`.
 
 ### Install ElasticSearch Plugin
 
-1 - Install the ElasticSearch plugin like [delete-by-query](https://www.elastic.co/guide/en/elasticsearch/plugins/current/plugins-delete-by-query.html).
+1 - Install an ElasticSearch plugin.
 
 ```bash
-docker exec {container-name} /usr/share/elasticsearch/bin/plugin install delete-by-query
+docker-compose exec elasticsearch /usr/share/elasticsearch/bin/plugin install {plugin-name}
 ```
 
 2 - Restart elasticsearch container
 
 ```bash
-docker restart {container-name}
+docker-compose restart elasticsearch
 ```
 
 

DOCUMENTATION/content/introduction/index.md

@@ -116,6 +116,11 @@ If you can't find your Software in the list, build it yourself and submit it. Co
 
 
 
+## Sponsors
+
+<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>
 
 
 
@@ -170,3 +175,21 @@ What's better than a **Demo Video**:
 You are welcome to join our chat room on Gitter.
 
 [![Gitter](https://badges.gitter.im/Laradock/laradock.svg)](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+
+
+
+
+<a name="Donations"></a>
+## Donations
+
+> Help keeping the project development going, by [contributing](http://laradock.io/contributing) or donating a little. 
+> Thanks in advance.
+
+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 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)

DOCUMENTATION/themes/hugo-material-docs/layouts/_default/single.html

@@ -20,11 +20,25 @@
 <main class="main">
 	<div class="drawer">
 		{{ partial "drawer" . }}
-	</div>
+    </div>
 
 	<article class="article">
 		<div class="wrapper">
-			<h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>
+
+            <!-- ------------------------------------------------------------------------- -->
+            <!-- Google Ads -->
+            <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+            <!-- Laradock Horizontal -->
+            <ins class="adsbygoogle"
+                 style="display:inline-block;width:890px;height:100px"
+                 data-ad-client="ca-pub-9826129398689742"
+                 data-ad-slot="2340256024"></ins>
+            <script>
+                (adsbygoogle = window.adsbygoogle || []).push({});
+            </script>
+            <!-- ------------------------------------------------------------------------- -->
+
+            <h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>
 
 			{{ .Content }}
 

DOCUMENTATION/themes/hugo-material-docs/layouts/index.html

@@ -24,6 +24,20 @@
 
 	<article class="article">
 		<div class="wrapper">
+
+            <!-- ------------------------------------------------------------------------- -->
+            <!-- Google Ads -->
+            <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+            <!-- Laradock Horizontal -->
+            <ins class="adsbygoogle"
+                 style="display:inline-block;width:890px;height:100px"
+                 data-ad-client="ca-pub-9826129398689742"
+                 data-ad-slot="2340256024"></ins>
+            <script>
+                (adsbygoogle = window.adsbygoogle || []).push({});
+            </script>
+            <!-- ------------------------------------------------------------------------- -->
+
 			{{ range where .Site.Pages "Type" "index" }}
 				<h1>{{ .Title }} {{ if .IsDraft }} (Draft){{ end }}</h1>
 

DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html

@@ -42,18 +42,39 @@
         </ul>
         {{ end }}
 
-        {{ if isset .Site.Params "author" }}
+
+        <br>
+        <br>
+          <div>
+            <!-- ------------------------------------------------------------------------- -->
+            <!-- Google Ads -->
+            <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+            <!-- Laradock Vertical -->
+            <ins class="adsbygoogle"
+               style="display:inline-block;width:237px;height:600px"
+               data-ad-client="ca-pub-9826129398689742"
+               data-ad-slot="9891442983"></ins>
+            <script>
+              (adsbygoogle = window.adsbygoogle || []).push({});
+            </script>
+            <!-- ------------------------------------------------------------------------- -->
+          </div>
+          <br>
+          <br>
+
+
+          <!--{{ if isset .Site.Params "author" }}-->
         <!--<hr>-->
         <!--<span class="section">The author</span>-->
-        
+        <!---->
-        <ul>
+        <!--<ul>-->
-          {{ with .Site.Social.twitter }}
+          <!--{{ with .Site.Social.twitter }}-->
-          <li>
+          <!--<li>-->
-            <a href="https://twitter.com/{{ . }}" target="_blank" title="@{{ . }} on Twitter">
+            <!--<a href="https://twitter.com/{{ . }}" target="_blank" title="@{{ . }} on Twitter">-->
-              @{{ . }} on Twitter
+              <!--@{{ . }} on Twitter-->
-            </a>
+            <!--</a>-->
-          </li>
+          <!--</li>-->
-          {{ end }}
+          <!--{{ end }}-->
 
           <!--{{ with .Site.Social.github }}-->
           <!--<li>-->
@@ -63,16 +84,17 @@
           <!--</li>-->
           <!--{{ end }}-->
 
-          {{ with .Site.Social.email }}
+          <!--{{ with .Site.Social.email }}-->
-          <li>
+          <!--<li>-->
-            <a href="mailto:{{ . }}" title="Email of {{ . }}">
+            <!--<a href="mailto:{{ . }}" title="Email of {{ . }}">-->
-              Contact via email
+              <!--Contact via email-->
-            </a>
+            <!--</a>-->
-          </li>
+          <!--</li>-->
-          {{ end }}
+          <!--{{ end }}-->
-        </ul>
+        <!--</ul>-->
-        {{ end }}
+        <!--{{ end }}-->
       </div>
+
     </div>
   </div>
 </nav>

caddy/Caddyfile

@@ -25,6 +25,6 @@
     #  dns cloudflare
     #}
 }
-laradock.demo {
+laradock.demo:80 {
     root /var/www/public
 }

docker-compose.yml

@@ -19,6 +19,7 @@ services:
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
           - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
           - INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
+          - INSTALL_IMAP=${WORKSPACE_INSTALL_IMAP}
           - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
           - INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS}
           - INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
@@ -112,6 +113,8 @@ services:
       build:
         context: ./php-worker
         dockerfile: "Dockerfile-${PHP_VERSION}"
+        args:
+          - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
       volumes_from:
         - applications
       depends_on:

env-example

@@ -32,6 +32,7 @@ PHP_INTERPRETER=php-fpm
 WORKSPACE_INSTALL_XDEBUG=false
 WORKSPACE_INSTALL_LDAP=false
 WORKSPACE_INSTALL_SOAP=false
+WORKSPACE_INSTALL_IMAP=false
 WORKSPACE_INSTALL_MONGO=false
 WORKSPACE_INSTALL_PHPREDIS=false
 WORKSPACE_INSTALL_MSSQL=false
@@ -88,6 +89,10 @@ PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
 PHP_FPM_INSTALL_IMAGEMAGICK=false
 PHP_FPM_INSTALL_PG_CLIENT=false
 
+### PHP_WORKER #########################################################################################################
+
+PHP_WORKER_INSTALL_PGSQL=false
+
 ### NGINX ##############################################################################################################
 
 NGINX_HOST_HTTP_PORT=80
@@ -317,4 +322,3 @@ PHP_IDE_CONFIG=serverName=laradock
 # Fix for windows users to make sure the application path works.
 
 COMPOSE_CONVERT_WINDOWS_PATHS=1
-

php-fpm/Dockerfile-70

@@ -229,15 +229,6 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \
     docker-php-ext-install mysqli \
 ;fi
 
-#####################################
-# postgres Modifications:
-#####################################
-
-ARG INSTALL_POSTGRES=false
-RUN if [ ${INSTALL_POSTGRES} = true ]; then \
-    docker-php-ext-install pgsql \
-;fi
-
 #####################################
 # Tokenizer Modifications:
 #####################################

php-fpm/Dockerfile-71

@@ -238,15 +238,6 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \
     docker-php-ext-install mysqli \
 ;fi
 
-#####################################
-# postgres Modifications:
-#####################################
-
-ARG INSTALL_POSTGRES=false
-RUN if [ ${INSTALL_POSTGRES} = true ]; then \
-    docker-php-ext-install pgsql \
-;fi
-
 #####################################
 # Tokenizer Modifications:
 #####################################

php-worker/Dockerfile-70

@@ -24,6 +24,13 @@ RUN apk --update add wget \
 RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql mcrypt tokenizer xml
 RUN pecl channel-update pecl.php.net && pecl install memcached && docker-php-ext-enable memcached
 
+# Install PostgreSQL drivers:
+ARG INSTALL_PGSQL=false
+RUN if [ ${INSTALL_PGSQL} = true ]; then \
+    apk --update add postgresql-dev \
+        && docker-php-ext-install pdo_pgsql \
+;fi
+
 RUN rm /var/cache/apk/* \
     && mkdir -p /var/www
 

php-worker/Dockerfile-71

@@ -24,6 +24,13 @@ RUN apk --update add wget \
 RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql mcrypt tokenizer xml
 RUN pecl channel-update pecl.php.net && pecl install memcached && docker-php-ext-enable memcached
 
+# Install PostgreSQL drivers:
+ARG INSTALL_PGSQL=false
+RUN if [ ${INSTALL_PGSQL} = true ]; then \
+    apk --update add postgresql-dev \
+        && docker-php-ext-install pdo_pgsql \
+;fi
+
 RUN rm /var/cache/apk/* \
     && mkdir -p /var/www
 

workspace/Dockerfile-56

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/workspace:1.8-56
+FROM laradock/workspace:1.9-56
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -69,6 +69,21 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \
   apt-get -y install libxml2-dev php5.6-soap \
 ;fi
 
+#####################################
+# IMAP:
+#####################################
+USER root
+
+ARG INSTALL_IMAP=false
+ENV INSTALL_IMAP ${INSTALL_IMAP}
+
+RUN if [ ${INSTALL_IMAP} = true ]; then \
+  # Install the PHP IMAP extension
+  add-apt-repository -y ppa:ondrej/php && \
+  apt-get update -yqq && \
+  apt-get -y install php5.6-imap \
+;fi
+
 #####################################
 # Set Timezone
 #####################################

workspace/Dockerfile-70

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/workspace:1.8-70
+FROM laradock/workspace:1.9-70
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -82,6 +82,18 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
     apt-get install -y php7.0-ldap \
 ;fi
 
+#####################################
+# IMAP:
+#####################################
+
+ARG INSTALL_IMAP=false
+ENV INSTALL_IMAP ${INSTALL_IMAP}
+
+RUN if [ ${INSTALL_IMAP} = true ]; then \
+    apt-get update -yqq && \
+    apt-get install -y php7.0-imap \
+;fi
+
 #####################################
 # Set Timezone
 #####################################

workspace/Dockerfile-71

@@ -12,7 +12,7 @@
 # Note: Base Image name format {image-tag}-{php-version}
 #
 
-FROM laradock/workspace:1.8-71
+FROM laradock/workspace:1.9-71
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -52,7 +52,8 @@ ENV PGID ${PGID}
 
 RUN groupadd -g ${PGID} laradock && \
     useradd -u ${PUID} -g laradock -m laradock && \
-    apt-get update -yqq
+    apt-get update -yqq \
+    apt-get install -y python2.7
 
 #####################################
 # SOAP:
@@ -82,6 +83,18 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
     apt-get install -y php7.1-ldap \
 ;fi
 
+#####################################
+# IMAP:
+#####################################
+
+ARG INSTALL_IMAP=false
+ENV INSTALL_IMAP ${INSTALL_IMAP}
+
+RUN if [ ${INSTALL_IMAP} = true ]; then \
+    apt-get update -yqq && \
+    apt-get install -y php7.1-imap \
+;fi
+
 #####################################
 # Set Timezone
 #####################################
@@ -670,7 +683,8 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
 # Clean up
 USER root
 RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    npm config set python /usr/bin/python2.7
 
 # Set default work directory
 WORKDIR /var/www