Merge pull request #2273 from Insua/master

fix(compose file): add missing config for inotify and fswatch
Merge branch 'master' into master
2019-12-17 20:48:15 +08:00 · 2019-12-17 20:47:56 +08:00 · 2019-12-17 20:44:31 +08:00 · 2019-12-12 08:37:50 +08:00 · 2019-12-11 15:18:34 -03:00 · 2019-12-12 00:13:14 +08:00
5 changed files with 7 additions and 12 deletions
--- a/.devcontainer/devcontainer.example.json
+++ b/.devcontainer/devcontainer.example.json
@ -1,9 +1,6 @@
 {
  "name": "Laradock",
-  "dockerComposeFile": [
-    "../docker-compose.yml",
-    "docker-compose.extend.yml"
-  ],
+  "dockerComposeFile": "../docker-compose.yml",
  "remoteUser": "laradock",
  "runServices": [
    "nginx",
--- a/.devcontainer/docker-compose.extend-example.yml
+++ b/.devcontainer/docker-compose.extend-example.yml
@ -1,6 +0,0 @@
-version: '3'
-services:
-  workspace:
-    volumes:
-      - ~/.gitconfig:/home/laradock/.gitconfig
-      - ~/.ssh:/home/laradock/.ssh:ro
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/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` 



--- a/docker-compose.yml
+++ b/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}
--- a/php-fpm/Dockerfile
+++ b/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>"
Author	SHA1	Message	Date
Shao Yu-Lung (Allen)	d732318e52	Merge pull request #2273 from Insua/master fix(compose file): add missing config for inotify and fswatch	2019-12-17 20:48:15 +08:00
Shao Yu-Lung (Allen)	ccf85148e8	Merge branch 'master' into master	2019-12-17 20:47:56 +08:00
Shao Yu-Lung (Allen)	378900ee38	Merge pull request #2365 from amorZhu/master update document for workspace supervisor	2019-12-17 20:44:31 +08:00
Shao Yu-Lung (Allen)	e943d90ca2	Merge pull request #2427 from lbssousa/devcontainer-v3 Drop unneeded settings for devcontainer.json (VSCode already handles them automatically)	2019-12-12 08:37:50 +08:00
Laércio de Sousa	d847c1a8c5	Drop unneeded settings for devcontainer.json (VSCode already handles them automatically).	2019-12-11 15:18:34 -03:00
Shao Yu-Lung (Allen)	ace85c38d7	Merge pull request #2425 from bestlong/php-fpm-use-new-base-image php-fpm base image use 2.6.2	2019-12-12 00:13:14 +08:00
Shao Yu Lung	be48366190	php-fpm base image use 2.6.2	2019-12-11 21:18:57 +08:00
zhushaolong	0573bbc58a	update document for workspace supervisor	2019-11-13 14:16:47 +08:00
insua	1f2643f52c	fix(compose file): add missing config for inotify and fswatch	2019-09-11 16:59:56 +08:00