diff --git a/Makefile b/Makefile index 7acce43..f6872ae 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,11 @@ ENV = env PPR_OJS_IMAGE=$(PPR_OJS_IMAGE) dev dev34: down up down: - cd environment && $(ENV) docker-compose down -v || : + cd environment && $(ENV) docker compose down -v || : up: rm -rf environment/data/ojs/logs - cd environment && $(ENV) docker-compose up --build $(DETACHED_MODE) + cd environment && $(ENV) docker compose up --build $(DETACHED_MODE) release: new_version $(eval RELEASE_VERSION = $(shell cat VERSION)) diff --git a/environment/docker-compose.yml b/environment/docker-compose.yml index 830997c..4749062 100644 --- a/environment/docker-compose.yml +++ b/environment/docker-compose.yml @@ -60,6 +60,7 @@ services: ports: - "${HTTP_PORT:-8081}:80" - "${HTTPS_PORT:-443}:443" + - "9003:9003" volumes: - ./data/ojs/src:/tmp/ojs-src - ../pprOjsPlugin:/tmp/ojs-src/plugins/generic/pprOjsPlugin diff --git a/environment/xdebug.ini b/environment/xdebug.ini index e29c8bd..b4e578a 100644 --- a/environment/xdebug.ini +++ b/environment/xdebug.ini @@ -1,6 +1,7 @@ -zend_extension=xdebug - [xdebug] +zend_extension=xdebug.so xdebug.mode=develop,debug xdebug.client_host=host.docker.internal -xdebug.start_with_request=yes \ No newline at end of file +xdebug.start_with_request=yes +xdebug.idekey=VSCODE +xdebug.log=/var/log/xdebug.log \ No newline at end of file