Skip to content

Update Makefile to use 'docker compose', add port mapping in docker-c… #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jp-tosca merged 1 commit into from
Mar 12, 2025
Merged

Update Makefile to use 'docker compose', add port mapping in docker-c… #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
1 change: 1 addition & 0 deletions environment/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions environment/xdebug.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
xdebug.start_with_request=yes
xdebug.idekey=VSCODE
xdebug.log=/var/log/xdebug.log