Skip to content
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

adding xdebug to the test docker just run url with ?XDEBUG_SESSION_START=1 and wait on port 9003 #6857

Merged
merged 16 commits into from
Feb 14, 2024
Merged

adding xdebug to the test docker just run url with ?XDEBUG_SESSION_START=1 and wait on port 9003 #6857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
36a074a
adding xdebug to the test docker just run url with ?XDEBUG_SESSION_ST…
TiagoAtCision Feb 10, 2024
4f3f715
going back on the test file and add changes into dev one
TiagoAtCision Feb 11, 2024
f50df08
testing with linux with host.docker.internal
TiagoAtCision Feb 11, 2024
a72eb42
adding extrahost to test if it works in linux should be fine on win
TiagoAtCision Feb 11, 2024
c2a7f6d
removing some white spaces
TiagoMRodrigues Feb 11, 2024
d0c1c9f
Merge branch 'master' into add-xdebug
DawoudIO Feb 11, 2024
30110d6
Merge branch 'ChurchCRM:master' into add-xdebug
TiagoMRodrigues Feb 12, 2024
dd6c22a
Merge branch 'ChurchCRM:master' into add-xdebug
TiagoMRodrigues Feb 13, 2024
ef75bed
Merge branch 'master' into add-xdebug
DawoudIO Feb 13, 2024
32fff7f
Update .env
TiagoMRodrigues Feb 13, 2024
7252177
Update .env
TiagoMRodrigues Feb 13, 2024
c122ce5
this vesrion passed locally the test suite
TiagoMRodrigues Feb 13, 2024
2da1090
just deleting image folder no need to go with this
TiagoMRodrigues Feb 13, 2024
49ef1dd
Revert "just deleting image folder no need to go with this"
TiagoMRodrigues Feb 14, 2024
36dd097
Revert "this vesrion passed locally the test suite"
TiagoMRodrigues Feb 14, 2024
fd305f1
reverting file permissions and wrongfull deletions and adding back up…
TiagoMRodrigues Feb 14, 2024
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
6 changes: 5 additions & 1 deletion docker/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@ DEV_WEBSERVER_PORT=80
DEV_DATABASE_PORT=3306
DEV_MAILSERVER_PORT=1025
DEV_MAILSERVER_GUI_PORT=8025
DEV_ADMINER_PORT=8088
DEV_ADMINER_PORT=8088

XDEBUG_MODE="debug"
XDEBUG_CONFIG="client_host=host.docker.internal client_port=9003"

2 changes: 1 addition & 1 deletion docker/Dockerfile.churchcrm-apache-php8-dev-debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get update && \
RUN docker-php-ext-install -j$(nproc) xml exif pdo_mysql gettext iconv mysqli zip
RUN docker-php-ext-configure gd --with-freetype --with-jpeg

RUN docker-php-ext-install -j$(nproc) gd
RUN docker-php-ext-install -j$(nproc) gd && pecl install xdebug && docker-php-ext-enable xdebug

COPY ./apache/default.conf /etc/apache2/apache2.conf
RUN a2enmod rewrite
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.dev-php8-apache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ services:
- mailserver
env_file:
- .env
extra_hosts:
- host.docker.internal:host-gateway
depends_on:
database:
condition: service_healthy
Expand All @@ -59,5 +61,3 @@ services:
- ${DEV_MAILSERVER_GUI_PORT:-8025}:8025
hostname: crm-hostname



Loading