Merge branch 'master' into add-jdk

.env.example

@@ -122,6 +122,8 @@ WORKSPACE_INSTALL_NPM_GULP=true
 WORKSPACE_INSTALL_NPM_BOWER=false
 WORKSPACE_INSTALL_NPM_VUE_CLI=true
 WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false
+WORKSPACE_INSTALL_NPM_CHECK_UPDATES_CLI=false
+WORKSPACE_INSTALL_POPPLER_UTILS=false
 WORKSPACE_INSTALL_PHPREDIS=true
 WORKSPACE_INSTALL_WORKSPACE_SSH=false
 WORKSPACE_INSTALL_SUBVERSION=false
@@ -290,6 +292,7 @@ PHP_FPM_DEFAULT_LOCALE=POSIX
 PHP_FPM_XDEBUG_PORT=9000
 PHP_FPM_INSTALL_EVENT=false
 PHP_FPM_INSTALL_DNSUTILS=true
+PHP_FPM_INSTALL_POPPLER_UTILS=false
 
 PHP_FPM_PUID=1000
 PHP_FPM_PGID=1000
@@ -336,6 +339,7 @@ PHP_WORKER_INSTALL_XMLRPC=false
 PHP_WORKER_INSTALL_SSDB=false
 PHP_WORKER_INSTALL_EVENT=false
 PHP_WORKER_INSTALL_INTL=true
+PHP_WORKER_INSTALL_POPPLER_UTILS=false
 
 PHP_WORKER_PUID=1000
 PHP_WORKER_PGID=1000
@@ -377,6 +381,7 @@ LARAVEL_HORIZON_INSTALL_MONGO=false
 LARAVEL_HORIZON_INSTALL_CASSANDRA=false
 LARAVEL_HORIZON_INSTALL_FFMPEG=false
 LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM=false
+LARAVEL_HORIZON_INSTALL_POPPLER_UTILS=false
 LARAVEL_HORIZON_PGID=1000
 LARAVEL_HORIZON_PUID=1000
 
@@ -1080,3 +1085,7 @@ KEYCLOAK_POSTGRES_HOST=postgres
 KEYCLOAK_POSTGRES_USER=laradock_keycloak
 KEYCLOAK_POSTGRES_PASSWORD=laradock_keycloak
 KEYCLOAK_POSTGRES_DB=laradock_keycloak
+
+### Mailpit #################################################
+MAILPIT_HTTP_PORT=8125
+MAILPIT_SMTP_PORT=1125