Compare commits
3 Commits
202207.11.
...
202210.10.
Author | SHA1 | Date | |
---|---|---|---|
631bcff2d4 | |||
c1f3a3540f | |||
1307ae914d |
2
.env
2
.env
@@ -23,7 +23,7 @@ WOPI_SERVER=http://collabora:9980
|
|||||||
# ADMIN_PASSWORD=
|
# ADMIN_PASSWORD=
|
||||||
|
|
||||||
## Symfony/framework-bundle
|
## Symfony/framework-bundle
|
||||||
TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$',${TRUSTED_HOST_2},${TRUSTED_HOST_3}
|
TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$'
|
||||||
TRUSTED_PROXIES=~
|
TRUSTED_PROXIES=~
|
||||||
|
|
||||||
## Doctrine/doctrine-bundle
|
## Doctrine/doctrine-bundle
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-redis": "*",
|
"ext-redis": "*",
|
||||||
"chill-project/chill-bundles": "dev-master#5f6c11bde9ac1006c5b187c29f4c33ce0a44021b",
|
"chill-project/chill-bundles": "dev-master#69704e52116be5f85a090e70d4a3068308e12b25",
|
||||||
"symfony/flex": "^1.9",
|
"symfony/flex": "^1.9",
|
||||||
"symfony/http-client": "^4.4 || ^5",
|
"symfony/http-client": "^4.4 || ^5",
|
||||||
"nelmio/alice": "^3.8",
|
"nelmio/alice": "^3.8",
|
||||||
|
1376
composer.lock
generated
1376
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -38,7 +38,7 @@ security:
|
|||||||
#csrf_provider: security.csrf.token_manager
|
#csrf_provider: security.csrf.token_manager
|
||||||
logout_on_user_change: true
|
logout_on_user_change: true
|
||||||
logout:
|
logout:
|
||||||
path: /saml/logout
|
path: /logout
|
||||||
|
|
||||||
# uncomment to enable impersonate mode in Chill
|
# uncomment to enable impersonate mode in Chill
|
||||||
# https://symfony.com/doc/current/security/impersonating_user.html
|
# https://symfony.com/doc/current/security/impersonating_user.html
|
||||||
|
@@ -18,6 +18,8 @@ services:
|
|||||||
- PHP_FPM_USER=1000
|
- PHP_FPM_USER=1000
|
||||||
- PHP_FPM_GROUP=100
|
- PHP_FPM_GROUP=100
|
||||||
- COMPOSER_HOME=/var/www/app/.composer
|
- COMPOSER_HOME=/var/www/app/.composer
|
||||||
|
# this is required to run tests with database from vendor/chill-project/chill-bundles directory
|
||||||
|
- DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
|
||||||
links:
|
links:
|
||||||
- smtp
|
- smtp
|
||||||
|
|
||||||
@@ -26,9 +28,11 @@ services:
|
|||||||
- .:/var/www/app
|
- .:/var/www/app
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgis/postgis:12-3.1-alpine
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
|
- ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
|
||||||
|
# if you prefer to store the data somewhere into your user path, instead of the docker's path
|
||||||
|
# this is useful not to loose data when you run `docker container prune` or `docker volume prune`
|
||||||
|
- /path/to/your/db/data:/var/lib/postgresql
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:5432:5432"
|
- "127.0.0.1:5432:5432"
|
||||||
environment:
|
environment:
|
||||||
|
@@ -34,7 +34,7 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "8001:80"
|
- "8001:80"
|
||||||
db:
|
db:
|
||||||
image: postgis/postgis:12-3.1-alpine
|
image: postgis/postgis:14-3.3-alpine
|
||||||
volumes:
|
volumes:
|
||||||
- ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
|
- ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
|
||||||
ports:
|
ports:
|
||||||
|
Reference in New Issue
Block a user