Skip to content

Commit 2a40560

Browse files
committed
Fix issues faced during local setup
1 parent b4e5ef9 commit 2a40560

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PHPARGS=-dmemory_limit=64M
2-
#PHPARGS=-dmemory_limit=64M -dzend_extension=xdebug.so -dxdebug.remote_enable=1 -dxdebug.remote_host=127.0.0.1 -dxdebug.remote_autostart=1
3-
#PHPARGS=-dmemory_limit=64M -dxdebug.remote_enable=1
2+
#PHPARGS=-dmemory_limit=64M -dzend_extension=xdebug.so -dxdebug.mode=debug -dxdebug.remote_host=127.0.0.1 -dxdebug.start_with_request=yes
3+
#PHPARGS=-dmemory_limit=64M -dxdebug.mode=debug
44

55
all:
66

@@ -24,9 +24,9 @@ clean_all:
2424

2525
up:
2626
docker-compose up -d
27-
chmod +rw -R tests/tmp
28-
chmod +rw -R tests/codeception
29-
mkdir -p tests/testapp/runtime && chmod +rw -R tests/testapp/runtime
27+
docker-compose run --rm php bash -c 'chmod +rw -R tests/tmp'
28+
docker-compose run --rm php bash -c 'chmod +rw -R tests/codeception'
29+
docker-compose run --rm php bash -c 'mkdir -p tests/testapp/runtime && chmod +rw -R tests/testapp/runtime'
3030

3131
cli:
3232
docker-compose exec php bash

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,3 @@ With https://fractal.thephpleague.com
2727
- Run `make up`
2828
- Run once `make installdocker`
2929
- Run `make testdocker` or `make cli` and inside docker env `make test`
30-
31-

tests/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM yiisoftware/yii2-php:7.1-apache
1+
FROM yiisoftware/yii2-php:7.4-apache
22

33
ENV INSIDE_DOCKER=1
44

55
COPY apache.conf /etc/apache2/sites-enabled/000-default.conf
66

77
# enable xdebug
88
RUN docker-php-ext-enable xdebug
9-
COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
9+
COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini

tests/docker/xdebug.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
xdebug.remote_enable=1
2-
xdebug.remote_autostart=1
3-
xdebug.remote_connect_back=1
1+
xdebug.mode=debug
2+
xdebug.start_with_request=yes
3+
xdebug.discover_client_host=1
44
;xdebug.remote_host=host.docker.internal
5-
xdebug.remote_port=9000
5+
xdebug.client_port=9000
66
xdebug.idekey=PHPSTORM
7-
xdebug.remote_timeout = 10
7+
xdebug.connect_timeout_ms = 10

0 commit comments

Comments
 (0)