forked from Chill-project/chill-skeleton-basic
Compare commits
7 Commits
add-dav-fe
...
2.9.1
Author | SHA1 | Date | |
---|---|---|---|
7f85d66337
|
|||
cc716beaec
|
|||
ac61038625 | |||
9827832753
|
|||
0706901415
|
|||
c4d3c784d3
|
|||
ce136ba0f3 |
8
Makefile
8
Makefile
@@ -2,12 +2,12 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
|
|||||||
PWD:=$(shell echo ${PWD})
|
PWD:=$(shell echo ${PWD})
|
||||||
UID:=$(shell id -u)
|
UID:=$(shell id -u)
|
||||||
GID:=$(shell id -g)
|
GID:=$(shell id -g)
|
||||||
BASE_TAG=chill_base_php82
|
|
||||||
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
|
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
|
||||||
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
|
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
|
||||||
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(BASE_TAG)
|
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(PHP_BASE_IMAGE_TAG)
|
||||||
PHP_BASE_IMAGE=php:8.2-fpm-alpine
|
PHP_BASE_IMAGE=php:8.2-fpm-alpine
|
||||||
PHP_BASE_IMAGE_CHILL=chill_php82
|
PHP_BASE_IMAGE_TARGET=chill_base_php82
|
||||||
|
PHP_BASE_IMAGE_TAG=chill_php82
|
||||||
NGINX_BASE_IMAGE=nginx
|
NGINX_BASE_IMAGE=nginx
|
||||||
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
|
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
|
||||||
ifneq (,$(wildcard ./.env))
|
ifneq (,$(wildcard ./.env))
|
||||||
@@ -39,7 +39,7 @@ build-assets:
|
|||||||
$(DOCKERNODE_CMD) yarn run encore production
|
$(DOCKERNODE_CMD) yarn run encore production
|
||||||
|
|
||||||
init:
|
init:
|
||||||
docker build --target $(PHP_BASE_IMAGE_CHILL) -t $(BASE_TAG) .
|
docker build --pull --target $(PHP_BASE_IMAGE_TARGET) --tag $(PHP_BASE_IMAGE_TAG) .
|
||||||
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
|
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
|
||||||
@$(MAKE) -f $(THIS_FILE) build-assets
|
@$(MAKE) -f $(THIS_FILE) build-assets
|
||||||
@$(MAKE) -f $(THIS_FILE) post-install
|
@$(MAKE) -f $(THIS_FILE) post-install
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-redis": "*",
|
"ext-redis": "*",
|
||||||
"chill-project/chill-bundles": "dev-master#00e62442ccd3695f3a418d192977672166f85427",
|
"chill-project/chill-bundles": "2.9.1",
|
||||||
"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",
|
||||||
@@ -53,7 +53,8 @@
|
|||||||
"bin-dir": "bin",
|
"bin-dir": "bin",
|
||||||
"allow-plugins": {
|
"allow-plugins": {
|
||||||
"ocramius/package-versions": true,
|
"ocramius/package-versions": true,
|
||||||
"symfony/flex": true
|
"symfony/flex": true,
|
||||||
|
"symfony/runtime": true
|
||||||
},
|
},
|
||||||
"preferred-install": {
|
"preferred-install": {
|
||||||
"chill-project/chill-bundles": "source",
|
"chill-project/chill-bundles": "source",
|
||||||
|
1529
composer.lock
generated
1529
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -33,6 +33,3 @@ framework:
|
|||||||
## sf4 check: ou à déplacer dans un chill.yaml
|
## sf4 check: ou à déplacer dans un chill.yaml
|
||||||
assets:
|
assets:
|
||||||
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
|
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
|
||||||
|
|
||||||
templating:
|
|
||||||
engines: ['twig']
|
|
||||||
|
@@ -29,14 +29,6 @@ security:
|
|||||||
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
||||||
security: false
|
security: false
|
||||||
|
|
||||||
dav:
|
|
||||||
pattern: ^/dav
|
|
||||||
provider: chain_provider
|
|
||||||
stateless: true
|
|
||||||
guard:
|
|
||||||
authenticators:
|
|
||||||
- Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
|
|
||||||
|
|
||||||
wopi:
|
wopi:
|
||||||
pattern: ^/wopi
|
pattern: ^/wopi
|
||||||
provider: chain_provider
|
provider: chain_provider
|
||||||
|
@@ -739,9 +739,6 @@
|
|||||||
"symfony/string": {
|
"symfony/string": {
|
||||||
"version": "v5.1.3"
|
"version": "v5.1.3"
|
||||||
},
|
},
|
||||||
"symfony/templating": {
|
|
||||||
"version": "v4.4.11"
|
|
||||||
},
|
|
||||||
"symfony/translation": {
|
"symfony/translation": {
|
||||||
"version": "3.3",
|
"version": "3.3",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
Reference in New Issue
Block a user