Merge branch 'master' into php-fpm-install-imap

Author: bestlong

.travis.yml

@@ -10,29 +10,21 @@ env:
     - PHP_VERSION=56 BUILD_SERVICE=workspace
     - PHP_VERSION=70 BUILD_SERVICE=workspace
     - PHP_VERSION=71 BUILD_SERVICE=workspace
+    - PHP_VERSION=72 BUILD_SERVICE=workspace
 
     - PHP_VERSION=56 BUILD_SERVICE=php-fpm
     - PHP_VERSION=70 BUILD_SERVICE=php-fpm
     - PHP_VERSION=71 BUILD_SERVICE=php-fpm
+    - PHP_VERSION=72 BUILD_SERVICE=php-fpm
 
     - 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=72 BUILD_SERVICE=php-worker
 
-    - PHP_VERSION=56 BUILD_SERVICE=mssql
-    - PHP_VERSION=70 BUILD_SERVICE=mssql
-    - PHP_VERSION=71 BUILD_SERVICE=mssql
-
-    - PHP_VERSION=56 BUILD_SERVICE=rethinkdb
-    - PHP_VERSION=70 BUILD_SERVICE=rethinkdb
-    - PHP_VERSION=71 BUILD_SERVICE=rethinkdb
-
-    - PHP_VERSION=56 BUILD_SERVICE=aerospike
-    - PHP_VERSION=70 BUILD_SERVICE=aerospike
-    - PHP_VERSION=71 BUILD_SERVICE=aerospike
-
+    - PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike"
     - 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 haproxy"

DOCUMENTATION/content/documentation/index.md

@@ -1729,3 +1729,13 @@ This error sometimes happens because your Laravel application isn't running on t
 ## I get stuck when building nginx on `fetch http://mirrors.aliyun.com/alpine/v3.5/main/x86_64/APKINDEX.tar.gz`
 
 As stated on [#749](https://github.com/laradock/laradock/issues/749#issuecomment-293296687), removing the line `RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories` from `nginx/Dockerfile` solves the problem.		
+
+## Custom composer repo packagist url and npm registry url
+
+In China, the origin source of composer and npm is very slow. You can add `WORKSPACE_NPM_REGISTRY` and `WORKSPACE_COMPOSER_REPO_PACKAGIST` config in `.env` to use your custom source.
+
+Example:
+```bash
+WORKSPACE_NPM_REGISTRY=https://registry.npm.taobao.org
+WORKSPACE_COMPOSER_REPO_PACKAGIST=https://packagist.phpcomposer.com
+```

docker-compose.yml

@@ -23,12 +23,14 @@ services:
           - INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS}
           - INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
           - INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
+          - NPM_REGISTRY=${WORKSPACE_NPM_REGISTRY}
           - INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
           - INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH}
           - INSTALL_DRUPAL_CONSOLE=${WORKSPACE_INSTALL_DRUPAL_CONSOLE}
           - INSTALL_AEROSPIKE=${WORKSPACE_INSTALL_AEROSPIKE}
           - INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS}
           - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
+          - COMPOSER_REPO_PACKAGIST=${WORKSPACE_COMPOSER_REPO_PACKAGIST}
           - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
           - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
           - INSTALL_LARAVEL_INSTALLER=${WORKSPACE_INSTALL_LARAVEL_INSTALLER}

env-example

@@ -8,9 +8,9 @@
 APPLICATION=../
 
 ### PHP Version ########################################################################################################
-# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 71 - 70 - 56
+# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 72 - 71 - 70 - 56
 
-PHP_VERSION=71
+PHP_VERSION=72
 
 ### PHP Interpreter ####################################################################################################
 # Select the PHP Interpreter. Accepted values: hhvm - php-fpm
@@ -67,12 +67,14 @@ WORKSPACE_INSTALL_AMQP=false
 WORKSPACE_INSTALL_PHPREDIS=false
 WORKSPACE_INSTALL_MSSQL=false
 WORKSPACE_INSTALL_NODE=false
+WORKSPACE_NPM_REGISTRY=
 WORKSPACE_INSTALL_YARN=false
 WORKSPACE_INSTALL_DRUSH=false
 WORKSPACE_INSTALL_DRUPAL_CONSOLE=false
 WORKSPACE_INSTALL_AEROSPIKE=false
 WORKSPACE_INSTALL_V8JS=false
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
+WORKSPACE_COMPOSER_REPO_PACKAGIST=
 WORKSPACE_INSTALL_WORKSPACE_SSH=false
 WORKSPACE_INSTALL_LARAVEL_ENVOY=false
 WORKSPACE_INSTALL_LARAVEL_INSTALLER=false

nginx/sites/app.conf.example

@@ -18,6 +18,8 @@ server {
         fastcgi_buffers 16 16k;
         fastcgi_buffer_size 32k;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        #fixes timeouts
+        fastcgi_read_timeout 600;
         include fastcgi_params;
     }
 

nginx/sites/default.conf

@@ -18,6 +18,8 @@ server {
         fastcgi_buffers 16 16k;
         fastcgi_buffer_size 32k;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        #fixes timeouts
+        fastcgi_read_timeout 600;
         include fastcgi_params;
     }
 

nginx/sites/laravel.conf.example

@@ -18,6 +18,8 @@ server {
         fastcgi_buffers 16 16k;
         fastcgi_buffer_size 32k;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        #fixes timeouts
+        fastcgi_read_timeout 600;
         include fastcgi_params;
     }
 

nginx/sites/symfony.conf.example

@@ -20,6 +20,8 @@ server {
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        #fixes timeouts
+        fastcgi_read_timeout 600;
         fastcgi_param HTTPS off;
     }
 

php-fpm/Dockerfile-56

@@ -177,7 +177,8 @@ ARG INSTALL_GMP=false
 RUN if [ ${INSTALL_GMP} = true ]; then \
     # Install the GMP extension
 	apt-get update -yqq && \
-	apt-get install -y libgmp-dev && \ 
+	apt-get install -y libgmp-dev && \
+	ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
     docker-php-ext-install gmp \
 ;fi
 
@@ -324,7 +325,7 @@ ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
     apt-get update -y && \
-    apt-get install -y libmagickwand-dev imagemagick && \ 
+    apt-get install -y libmagickwand-dev imagemagick && \
     pecl install imagick && \
     docker-php-ext-enable imagick \
 ;fi
@@ -342,6 +343,12 @@ RUN if [ ${INSTALL_IMAP} = true ]; then \
     docker-php-ext-install imap \
 ;fi
 
+#####################################
+# Check PHP version:
+#####################################
+
+RUN php -v | head -n 1 | grep -q "PHP 5.6."
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

php-fpm/Dockerfile-70

@@ -318,12 +318,10 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
         && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
         && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
         && apt-get update -yqq \
-
     # Install Dependencies
         && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
         && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
         && locale-gen \
-
     # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
         && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
         && docker-php-ext-enable pdo_sqlsrv sqlsrv \
@@ -366,6 +364,12 @@ RUN if [ ${INSTALL_IMAP} = true ]; then \
     docker-php-ext-install imap \
 ;fi
 
+#####################################
+# Check PHP version:
+#####################################
+
+RUN php -v | head -n 1 | grep -q "PHP 7.0."
+
 #
 #--------------------------------------------------------------------------
 # Final Touch