From b79aa71ed691e8421af079bb4ef30dd58525fb62 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@hebeler.club>
Date: Fri, 10 Mar 2023 10:02:07 +0100
Subject: [PATCH] fixed debugger configuration
---
.vscode/launch.json | 11 -----------
build/fpm/configuration/php/development.ini | 3 +--
docker-compose.yml | 8 ++++++--
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2910de9f2..d2db80a28 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,17 +12,6 @@
"pathMappings": {
"/metager/metager_app": "${workspaceRoot}/metager"
}
- },
- {
- "name": "PHP - Launch currently open script",
- "type": "php",
- "request": "launch",
- "port": 9003,
- "program": "${file}",
- "cwd": "${fileDirname}",
- "pathMappings": {
- "/metager/metager_app": "${workspaceRoot}/metager"
- }
}
]
}
\ No newline at end of file
diff --git a/build/fpm/configuration/php/development.ini b/build/fpm/configuration/php/development.ini
index c06cc5178..b9f6c91ad 100644
--- a/build/fpm/configuration/php/development.ini
+++ b/build/fpm/configuration/php/development.ini
@@ -5,8 +5,7 @@ expose_php = On
xdebug.mode = debug
xdebug.log_level= 0
xdebug.start_with_request = yes
-xdebug.discover_client_host = true
-xdebug.idekey=VSCODE
+xdebug.client_host=host.docker.internal
; OP cache
opcache.enable=0
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a9ddd2b13..9b1558bee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,8 @@ services:
- metager
volumes:
- ./metager:/metager/metager_app
+ extra_hosts:
+ - "host.docker.internal:host-gateway"
healthcheck:
test: "curl -f http://nginx:8080/health-check/liveness"
nginx:
@@ -46,6 +48,8 @@ services:
- metager
volumes:
- ./metager:/metager/metager_app
+ extra_hosts:
+ - "host.docker.internal:host-gateway"
healthcheck:
test: "curl -f http://nginx:8080/health-check/liveness-scheduler"
worker:
@@ -57,7 +61,7 @@ services:
networks:
- metager
extra_hosts:
- - "dockerhost:192.168.5.1"
+ - "host.docker.internal:host-gateway"
volumes:
- ./metager:/metager/metager_app
healthcheck:
@@ -112,4 +116,4 @@ networks:
ipam:
driver: default
config:
- - subnet: "192.168.5.0/24"
\ No newline at end of file
+ - subnet: "192.168.5.0/24"
--
GitLab