Merge pull request #2273 from Insua/master

fix(compose file): add missing config for inotify and fswatch

.devcontainer/devcontainer.example.json

@@ -1,9 +1,6 @@
 {
   "name": "Laradock",
-  "dockerComposeFile": [
+  "dockerComposeFile": "../docker-compose.yml",
-    "../docker-compose.yml",
-    "docker-compose.extend.yml"
-  ],
   "remoteUser": "laradock",
   "runServices": [
     "nginx",

.devcontainer/docker-compose.extend-example.yml

@@ -1,6 +0,0 @@
-version: '3'
-services:
-  workspace:
-    volumes:
-      - ~/.gitconfig:/home/laradock/.gitconfig
-      - ~/.ssh:/home/laradock/.ssh:ro

DOCUMENTATION/content/documentation/index.md

@@ -1889,7 +1889,9 @@ To install Supervisor in the Workspace container
 
 2 - Set `WORKSPACE_INSTALL_SUPERVISOR` and `WORKSPACE_INSTALL_PYTHON` to `true`.
 
-3 - Re-build the container `docker-compose build workspace` Or `docker-composer up --build -d workspace` 
+3 - Create supervisor configuration file (for ex., named `laravel-worker.conf`) for Laravel Queue Worker in `php-worker/supervisord.d/` by simply copy from `laravel-worker.conf.example`
+
+4 - Re-build the container `docker-compose build workspace` Or `docker-composer up --build -d workspace` 
 
 
 

docker-compose.yml

@@ -117,6 +117,8 @@ services:
           - INSTALL_MYSQL_CLIENT=${WORKSPACE_INSTALL_MYSQL_CLIENT}
           - INSTALL_PING=${WORKSPACE_INSTALL_PING}
           - INSTALL_SSHPASS=${WORKSPACE_INSTALL_SSHPASS}
+          - INSTALL_INOTIFY=${WORKSPACE_INSTALL_INOTIFY}
+          - INSTALL_FSWATCH=${WORKSPACE_INSTALL_FSWATCH}
           - INSTALL_AST=${WORKSPACE_INSTALL_AST}
           - INSTALL_YAML=${WORKSPACE_INSTALL_YAML}
           - INSTALL_MAILPARSE=${WORKSPACE_INSTALL_MAILPARSE}

php-fpm/Dockerfile

@@ -14,7 +14,7 @@
 
 ARG LARADOCK_PHP_VERSION
 
-FROM laradock/php-fpm:2.6.1-${LARADOCK_PHP_VERSION}
+FROM laradock/php-fpm:2.6.2-${LARADOCK_PHP_VERSION}
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"