Skip to content

Commit 11af176

Browse files
dunglasLucasHospice
authored andcommitted
chore: minor improvements and sync with API Platform (dunglas#277)
1 parent 43bb351 commit 11af176

File tree

4 files changed

+13
-18
lines changed

4 files changed

+13
-18
lines changed

.dockerignore

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
**/*.log
22
**/*.md
33
**/*.php~
4+
**/*.dist.php
5+
**/*.dist
6+
**/*.cache
47
**/._*
58
**/.dockerignore
69
**/.DS_Store
@@ -14,15 +17,14 @@
1417
**/docker-compose.yml
1518
**/Dockerfile
1619
**/Thumbs.db
20+
.github/
21+
docs/
22+
public/bundles/
23+
tests/
24+
var/
25+
vendor/
1726
.editorconfig
1827
.env.*.local
1928
.env.local
2029
.env.local.php
21-
.php_cs.cache
22-
bin/*
23-
!bin/console
24-
docker/db/data/
25-
helm/
26-
public/bundles/
27-
var/
28-
vendor/
30+
.env.test

.editorconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ charset = utf-8
1515
trim_trailing_whitespace = true
1616
insert_final_newline = true
1717

18-
[*.{js,html}]
18+
[*.{js,html,ts,tsx}]
1919
indent_style = space
2020
indent_size = 2
2121

@@ -43,10 +43,6 @@ indent_style = space
4343
indent_size = 4
4444
trim_trailing_whitespace = false
4545

46-
[api/helm/api/**.yaml]
47-
indent_style = space
48-
indent_size = 2
49-
5046
[.github/workflows/*.yml]
5147
indent_style = space
5248
indent_size = 2

docker-compose.override.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ services:
88
volumes:
99
- ./:/srv/app
1010
- ./docker/php/conf.d/app.dev.ini:/usr/local/etc/php/conf.d/app.dev.ini:ro
11-
# If you develop on Mac or Windows you can remove the var/ and vendor/ directories
12-
# from the bind-mount for better performance by enabling the next 2 lines:
13-
#- /srv/app/var
11+
# If you develop on Mac or Windows you can remove the vendor/ directory
12+
# from the bind-mount for better performance by enabling the next line:
1413
#- /srv/app/vendor
1514
environment:
1615
# See https://xdebug.org/docs/all_settings#mode

docker/php/docker-entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ if [ "${1#-}" != "$1" ]; then
77
fi
88

99
if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
10-
mkdir -p var/cache var/log
11-
1210
# Install the project the first time PHP is started
1311
# After the installation, the following block can be deleted
1412
if [ ! -f composer.json ]; then

0 commit comments

Comments
 (0)