Compare commits

..

11 Commits

Author SHA1 Message Date
f06b8dcd1e upgrade to chill 2.9.2 2023-10-17 23:39:58 +02:00
7f85d66337 upgrade chill to 2.9.1 2023-10-17 22:14:11 +02:00
cc716beaec upgrade to chill version 2.9.0 2023-10-17 16:22:42 +02:00
ac61038625 update to last chill dep version 2023-10-05 07:56:04 +00:00
9827832753 Add symfony flex and symfony runtime to composer.json 2023-09-26 16:26:22 +02:00
0706901415 update composer.json to chill-bundles version 2.6.3 2023-09-26 12:41:43 +02:00
c4d3c784d3 fix mismatches of variables in Makefile 2023-09-22 17:47:13 +02:00
ce136ba0f3 revert 05d4a10a5b
revert Dav: configuration of security for allowing dav endpoints
2023-09-22 09:16:51 +00:00
05d4a10a5b Dav: configuration of security for allowing dav endpoints 2023-09-17 15:47:05 +02:00
Lucas Silva
c06166fdc2 update composer 2023-04-26 13:43:36 +02:00
fb1219163e DX: sign drone file 2023-04-25 15:09:50 +02:00
6 changed files with 703 additions and 847 deletions

View File

@@ -111,6 +111,6 @@ steps:
---
kind: signature
hmac: 212da184e3fedeb03530cc66dbf9c8974e461e214dda5a698b11012e66e4531a
hmac: 707a5ef589fb6320f9e9e1dec7d8d4d11b477ba09e3b2b08d6f31f98d6d3f5d0
...

View File

@@ -2,12 +2,12 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
PWD:=$(shell echo ${PWD})
UID:=$(shell id -u)
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
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_CHILL=chill_php82
PHP_BASE_IMAGE_TARGET=chill_base_php82
PHP_BASE_IMAGE_TAG=chill_php82
NGINX_BASE_IMAGE=nginx
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
ifneq (,$(wildcard ./.env))
@@ -39,7 +39,7 @@ build-assets:
$(DOCKERNODE_CMD) yarn run encore production
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
@$(MAKE) -f $(THIS_FILE) build-assets
@$(MAKE) -f $(THIS_FILE) post-install

View File

@@ -15,7 +15,7 @@
},
"require": {
"ext-redis": "*",
"chill-project/chill-bundles": "dev-master#a539febcfea6ea164d224db48bd903e0db60077b",
"chill-project/chill-bundles": "2.9.2",
"symfony/flex": "^1.9",
"symfony/http-client": "^4.4 || ^5",
"nelmio/alice": "^3.8",
@@ -53,7 +53,8 @@
"bin-dir": "bin",
"allow-plugins": {
"ocramius/package-versions": true,
"symfony/flex": true
"symfony/flex": true,
"symfony/runtime": true
},
"preferred-install": {
"chill-project/chill-bundles": "source",

1529
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -33,6 +33,3 @@ framework:
## sf4 check: ou à déplacer dans un chill.yaml
assets:
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
templating:
engines: ['twig']

View File

@@ -739,9 +739,6 @@
"symfony/string": {
"version": "v5.1.3"
},
"symfony/templating": {
"version": "v4.4.11"
},
"symfony/translation": {
"version": "3.3",
"recipe": {