Skip to content

Commit 8c64047

Browse files
committed
Merge branch 'release/0.2.4'
2 parents 092336b + e166d8a commit 8c64047

4 files changed

Lines changed: 3 additions & 19 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
composer.lock
33
phpunit.xml
44
/var/
5+
/dev
56
vendor
67
.phpunit.result.cache
78
docker-compose.override.yaml

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ RUN grep -q '^opcache.validate_timestamps=0' /usr/local/etc/php/conf.d/opcache.i
115115
|| echo 'opcache.validate_timestamps=1' >> /usr/local/etc/php/conf.d/opcache.ini
116116

117117
#Install Symfony CLI
118-
RUN wget https://get.symfony.com/cli/installer -O - | bash && mv /root/.symfony/bin/symfony /usr/local/bin/symfony
118+
RUN wget https://get.symfony.com/cli/installer -O - | bash && mv /root/.symfony5/bin/symfony /usr/local/bin/symfony
119119

120120
RUN chown -R 1000 /srv/app \
121121
&& chown -R 1000 /opt

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": "^8.0",
14-
"codebuds/webp-converter": "^0.5.0",
14+
"codebuds/webp-converter": "^0.5.1",
1515
"symfony/console": "^5.0 || ^6.0",
1616
"symfony/stopwatch": "^5.0 || ^6.0",
1717
"symfony/finder": "^5.0 || ^6.0",

docker-compose.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,6 @@ version: '3.7'
22

33
services:
44
php:
5-
build:
6-
dockerfile: Dockerfile
7-
context: .
8-
target: php_dev
9-
args:
10-
PHP_VERSION: '7.4'
11-
user: 1000:1500
12-
networks:
13-
- internal
14-
working_dir: /srv/app
15-
environment:
16-
- PHP_IDE_CONFIG=serverName=Xdebug
17-
- XDEBUG_CONFIG=discover_client_host=1 client_host=host.docker.internal
18-
volumes:
19-
- .:/srv/app
20-
21-
php8:
225
build:
236
dockerfile: Dockerfile
247
context: .

0 commit comments

Comments
 (0)