From 34ceffdae0ab9764eeed33343708d455cd2832b5 Mon Sep 17 00:00:00 2001
From: Arthur de Moulins <arthurdemoulins@gmail.com>
Date: Fri, 28 Feb 2020 17:56:52 +0100
Subject: [PATCH] add doc for xdebug for macos, fix worker cmd

---
 .env                                      | 2 +-
 Dockerfile                                | 2 +-
 README.md                                 | 8 ++++++++
 docker-compose.override.yml               | 2 +-
 docker/phraseanet/worker/entrypoint.sh    | 2 +-
 docker/phraseanet/worker/scheduler-run.sh | 3 ---
 6 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100755 docker/phraseanet/worker/scheduler-run.sh

diff --git a/.env b/.env
index 064a771509..018bc8d64b 100644
--- a/.env
+++ b/.env
@@ -59,7 +59,7 @@ XDEBUG_ENABLED=1
 XDEBUG_PROFILER_ENABLED=0
 IDE_KEY=PHPSTORM
 PHRASEANET_SUBNET_IPS=172.32.0.0/16
-PHRASEANET_GATEWAY_IP=172.32.0.1
+XDEBUG_REMOTE_HOST=172.32.0.1
 PHP_IDE_CONFIG=serverName=docker-server-phraseanet
 
 # Volumes location for dev
diff --git a/Dockerfile b/Dockerfile
index c905097a4f..13daa50724 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -116,7 +116,7 @@ CMD ["php-fpm", "-F"]
 
 FROM phraseanet-fpm as phraseanet-worker
 ENTRYPOINT ["docker/phraseanet/worker/entrypoint.sh"]
-CMD ["docker/phraseanet/worker/scheduler-run.sh"]
+CMD ["bin/console", "task-manager:scheduler:run"]
 
 #########################################################################
 # phraseanet-nginx
diff --git a/README.md b/README.md
index e56167d189..1a6bf5f756 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,14 @@ For PhpStorm, you can follow this example:
 
 > Configure the `Absolute path on the server` to `/var/alchemy/Phraseanet` at the project root path (i.e. `~/projects/Phraseanet`).
 
+#### Xdebug on MacOS
+
+You have to set the following env:
+```bash
+XDEBUG_REMOTE_HOST=host.docker.internal
+```
+
+> Don't forget to recreate your container (`docker-compose up -d phraseanet`)
 
 # With Vagrant (deprecated)
 
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index a950465f06..ab45ccdb4a 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -30,7 +30,7 @@ services:
   phraseanet:
     environment:
     - XDEBUG_ENABLED
-    - XDEBUG_CONFIG=remote_host=${PHRASEANET_GATEWAY_IP} idekey=${IDE_KEY} remote_enable=1 profiler_enable=${XDEBUG_PROFILER_ENABLED} profiler_output_dir=/var/alchemy/Phraseanet/cache/profiler
+    - XDEBUG_CONFIG=remote_host=${XDEBUG_REMOTE_HOST} idekey=${IDE_KEY} remote_enable=1 profiler_enable=${XDEBUG_PROFILER_ENABLED} profiler_output_dir=/var/alchemy/Phraseanet/cache/profiler
     - PHP_IDE_CONFIG
     volumes:
     - .:/var/alchemy/Phraseanet
diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh
index c73a924ebc..d4d773c829 100755
--- a/docker/phraseanet/worker/entrypoint.sh
+++ b/docker/phraseanet/worker/entrypoint.sh
@@ -15,4 +15,4 @@ if [ ${XDEBUG_ENABLED} == "1" ]; then
     docker-php-ext-enable xdebug
 fi
 
-bash -e docker-php-entrypoint $@
+runuser -u app "$@"
diff --git a/docker/phraseanet/worker/scheduler-run.sh b/docker/phraseanet/worker/scheduler-run.sh
deleted file mode 100755
index 651ae42ee5..0000000000
--- a/docker/phraseanet/worker/scheduler-run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-runuser app -c 'php bin/console task-manager:scheduler:run'