Compare commits

...

12 Commits

Author SHA1 Message Date
d121f3343f Upgrade to chill-bundles/v3.0.0-RC6
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-23 17:22:20 +02:00
adba3b88ae Add WOPI_SERVER variable to .env file
A new environmental variable, WOPI_SERVER, has been added to the .env file. This addition is related to the configuration of the Collabora Online integration.
2024-07-18 23:14:03 +02:00
182f2fa111 release 2.0.0-RC2
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-18 16:12:54 +02:00
8a61ff2b7a Update workflow definition and configuration
The configuration for the workflow in the config/packages/workflow.yaml file has also been updated, notably by adding a marking store.
2024-07-18 16:11:04 +02:00
b6bc9e4a3a fix changelogs and description of changes 2024-07-18 13:00:40 +02:00
79e7a63941 release 2.0.0-RC1
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-18 10:41:18 +02:00
bdce8411b3 upgrade deps 2024-07-18 10:39:30 +02:00
40770834a3 switch to php8.3 and add amqp as pecl dependency 2024-07-18 10:38:44 +02:00
0cee0637c9 release 2.0.0-alpha4
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-03 14:21:18 +02:00
74ee56c960 add missing wopi configuration file 2024-07-03 14:19:55 +02:00
218b08a3c4 add graylog/gelf to image and release 2.0.0-alpha3
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-03 13:55:07 +02:00
80ae8c4302 release v2.0.0-alpha2
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-03 13:39:22 +02:00
16 changed files with 137 additions and 80 deletions

3
.changes/2.0.0-RC1.md Normal file
View File

@@ -0,0 +1,3 @@
## 2.0.0-RC1 - 2024-07-18
### Release
* upgrade to chill-bundles/3.0.0-RC5

3
.changes/2.0.0-RC2.md Normal file
View File

@@ -0,0 +1,3 @@
## 2.0.0-RC2 - 2024-07-18
### Fixed
* Fix definition of workflow

View File

@@ -1,3 +1,3 @@
## 2.0.0-alpha1 - 2024-07-03
### Release
* Upgrade chill to v2.0.0-RC3
* Upgrade chill to v3.0.0-RC3

3
.changes/2.0.0-alpha2.md Normal file
View File

@@ -0,0 +1,3 @@
## 2.0.0-alpha2 - 2024-07-03
### Release
* upgrade chill-bundle to v3.0.0-RC4

3
.changes/2.0.0-alpha3.md Normal file
View File

@@ -0,0 +1,3 @@
## 2.0.0-alpha3 - 2024-07-03
### Release
* Add graylog to image

3
.changes/2.0.0-alpha4.md Normal file
View File

@@ -0,0 +1,3 @@
## 2.0.0-alpha4 - 2024-07-03
### Release
* fixes

9
.changes/2.1.0-RC3.md Normal file
View File

@@ -0,0 +1,9 @@
## 2.1.0 - 2024-07-23
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
* Add graylog to image
* upgrade to chill-bundles/3.0.0-RC5
* Upgrade chill-bundles to v3.0.0-RC6
### Fixed
* Fix definition of workflow

View File

@@ -1,5 +0,0 @@
kind: Release
body: Upgrade chill to v3.0.0-RC3
time: 2024-07-03T12:46:35.963251524+02:00
custom:
Issue: ""

1
.env
View File

@@ -76,4 +76,5 @@ ADD_ADDRESS_MAP_CENTER_Z=14
# Variables for relatorio host, which generates documents
RELATORIO_HOST=
RELATORIO_PORT=
WOPI_SERVER=http://${COLLABORA_HOST}:${COLLABORA_PORT}
###< chill-project/chill-bundles ###

View File

@@ -6,6 +6,36 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
## 2.1.0 - 2024-07-23
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
* Add graylog to image
* upgrade to chill-bundles/3.0.0-RC5
* Upgrade chill-bundles to v3.0.0-RC6
### Fixed
* Fix definition of workflow
## 2.0.0-alpha4 - 2024-07-03
### Release
* fixes
## 2.0.0-alpha3 - 2024-07-03
### Release
* Add graylog to image
## 2.0.0-alpha2 - 2024-07-03
### Release
* upgrade chill-bundle to v3.0.0-RC4
## 2.0.0-alpha1 - 2024-07-03
### Release
* Upgrade chill to v2.0.0-RC3
* Upgrade chill to v3.0.0-RC3
## 2.0.0-RC2 - 2024-07-18
### Fixed
* Fix definition of workflow
## 2.0.0-RC1 - 2024-07-18
### Release
* upgrade to chill-bundles/3.0.0-RC5

View File

@@ -1,12 +1,13 @@
FROM php:8.2-fpm-alpine AS chill_base_php82
FROM php:8.3-fpm-alpine AS chill_base_php82
ENV POSTGRES_VERSION 14
ENV POSTGRES_VERSION=14
# default UID for the PHP user
ARG UID=1000
ARG GID=1000
# install php extensions and deps
# apk add --no-cache --update --virtual rabbitmq-c-dev rabbitmq-c-utils gcc g++ make autoconf && pecl install amqp
RUN apk update && apk add --no-cache \
wget gnupg \
libpq-dev \
@@ -16,6 +17,7 @@ RUN apk update && apk add --no-cache \
linux-headers \
gcc g++ make autoconf \
bash git \
rabbitmq-c rabbitmq-c-dev \
&& docker-php-ext-install pdo_pgsql intl mbstring zip bcmath exif sockets \
&& git clone https://github.com/nikic/php-ast.git \
&& cd php-ast \
@@ -26,6 +28,8 @@ RUN apk update && apk add --no-cache \
&& cd .. && rm -rf php-ast \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install amqp \
&& docker-php-ext-enable amqp \
&& apk add libpng-dev libjpeg-turbo-dev freetype-dev \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) gd \

View File

@@ -4,13 +4,14 @@
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
"php": ">=7.2.5",
"php": ">=8.2.0",
"ext-ctype": "*",
"ext-iconv": "*",
"champs-libres/wopi-bundle": "dev-master@dev",
"champs-libres/wopi-lib": "dev-master@dev",
"chill-project/chill-bundles": "v3.0.0-RC3",
"chill-project/chill-bundles": "v3.0.0-RC6",
"chill-project/chill-deploy": "^1.0",
"graylog2/gelf-php": "^2.0",
"symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/flex": "^1.17|^2",

118
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e29db7665f176385c33add162f4ca1be",
"content-hash": "b54c5d8f9a6fd245404d207b908f9c0d",
"packages": [
{
"name": "brick/math",
@@ -185,16 +185,16 @@
},
{
"name": "chill-project/chill-bundles",
"version": "v3.0.0-RC3",
"version": "v3.0.0-RC6",
"source": {
"type": "git",
"url": "https://gitlab.com/Chill-Projet/chill-bundles.git",
"reference": "f8fa96d8367d954ade4aebe31c2177ca9499a4fa"
"reference": "b42473b01deda59836f1d4c2d96a6eefd59f5414"
},
"dist": {
"type": "zip",
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=f8fa96d8367d954ade4aebe31c2177ca9499a4fa",
"reference": "f8fa96d8367d954ade4aebe31c2177ca9499a4fa",
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=b42473b01deda59836f1d4c2d96a6eefd59f5414",
"reference": "b42473b01deda59836f1d4c2d96a6eefd59f5414",
"shasum": ""
},
"require": {
@@ -208,7 +208,6 @@
"ext-json": "*",
"ext-openssl": "*",
"ext-redis": "*",
"graylog2/gelf-php": "^1.5",
"knplabs/knp-menu-bundle": "^3.0",
"knplabs/knp-time-bundle": "^1.12",
"knpuniversity/oauth2-client-bundle": "^2.10",
@@ -298,6 +297,7 @@
"type": "library",
"autoload": {
"psr-4": {
"Chill\\JobBundle\\": "src/Bundle/ChillJobBundle/src",
"Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
"Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
"Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
@@ -312,7 +312,8 @@
"Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
"Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle",
"Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
"Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src"
"Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
"Chill\\FranceTravailApiBundle\\": "src/Bundle/ChillFranceTravailApiBundle/src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -326,9 +327,9 @@
],
"support": {
"issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues",
"source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/v3.0.0-RC3"
"source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/v3.0.0-RC6"
},
"time": "2024-06-24T14:23:47+00:00"
"time": "2024-07-23T16:54:08+00:00"
},
{
"name": "chill-project/chill-deploy",
@@ -2211,36 +2212,31 @@
},
{
"name": "graylog2/gelf-php",
"version": "1.7.1",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/bzikarsky/gelf-php.git",
"reference": "8dceab86227c184725479cc36ab5cae4da940f6e"
"reference": "29ef48fa6eac6c8787b588949483f1739c57ad4f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bzikarsky/gelf-php/zipball/8dceab86227c184725479cc36ab5cae4da940f6e",
"reference": "8dceab86227c184725479cc36ab5cae4da940f6e",
"url": "https://api.github.com/repos/bzikarsky/gelf-php/zipball/29ef48fa6eac6c8787b588949483f1739c57ad4f",
"reference": "29ef48fa6eac6c8787b588949483f1739c57ad4f",
"shasum": ""
},
"require": {
"paragonie/constant_time_encoding": "^1|^2",
"php": ">=5.6",
"psr/log": "^1.0|^2.0"
"php": ">=8.0",
"psr/log": "^1|^2|^3"
},
"provide": {
"psr/log-implementation": "~1.0"
"psr/log-implementation": "3.0.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7|^6.5|^7.5",
"squizlabs/php_codesniffer": "^3.3"
"phpunit/phpunit": "^9.6|^10.1",
"squizlabs/php_codesniffer": "^3.6",
"vimeo/psalm": "^5.11"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
}
},
"autoload": {
"psr-4": {
"Gelf\\": "src/Gelf"
@@ -2253,7 +2249,7 @@
"authors": [
{
"name": "Benjamin Zikarsky",
"email": "benjamin@zikarsky.de"
"email": "benjamin@familie-zikarsky.de"
},
{
"name": "gelf-php contributors",
@@ -2263,28 +2259,28 @@
"description": "A php implementation to send log-messages to a GELF compatible backend like Graylog2.",
"support": {
"issues": "https://github.com/bzikarsky/gelf-php/issues",
"source": "https://github.com/bzikarsky/gelf-php/tree/1.7.1"
"source": "https://github.com/bzikarsky/gelf-php/tree/2.0.1"
},
"time": "2021-08-20T09:39:08+00:00"
"time": "2023-05-23T14:45:24+00:00"
},
{
"name": "guzzlehttp/guzzle",
"version": "7.8.1",
"version": "7.9.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
"reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
"reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a629e5b69db96eb4939c1b34114130077dd4c6fc",
"reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5.3 || ^2.0.1",
"guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
"guzzlehttp/promises": "^1.5.3 || ^2.0.3",
"guzzlehttp/psr7": "^2.7.0",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -2295,9 +2291,9 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"ext-curl": "*",
"php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
"guzzle/client-integration-tests": "3.0.2",
"php-http/message-factory": "^1.1",
"phpunit/phpunit": "^8.5.36 || ^9.6.15",
"phpunit/phpunit": "^8.5.39 || ^9.6.20",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@@ -2375,7 +2371,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.8.1"
"source": "https://github.com/guzzle/guzzle/tree/7.9.1"
},
"funding": [
{
@@ -2391,20 +2387,20 @@
"type": "tidelift"
}
],
"time": "2023-12-03T20:35:24+00:00"
"time": "2024-07-19T16:19:57+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "2.0.2",
"version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
"reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
"reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
"url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
"reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
"shasum": ""
},
"require": {
@@ -2412,7 +2408,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"phpunit/phpunit": "^8.5.36 || ^9.6.15"
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"type": "library",
"extra": {
@@ -2458,7 +2454,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/2.0.2"
"source": "https://github.com/guzzle/promises/tree/2.0.3"
},
"funding": [
{
@@ -2474,20 +2470,20 @@
"type": "tidelift"
}
],
"time": "2023-12-03T20:19:20+00:00"
"time": "2024-07-18T10:29:17+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "2.6.2",
"version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
"reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
"reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
"reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
"shasum": ""
},
"require": {
@@ -2502,8 +2498,8 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"http-interop/http-factory-tests": "^0.9",
"phpunit/phpunit": "^8.5.36 || ^9.6.15"
"http-interop/http-factory-tests": "0.9.0",
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -2574,7 +2570,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.6.2"
"source": "https://github.com/guzzle/psr7/tree/2.7.0"
},
"funding": [
{
@@ -2590,7 +2586,7 @@
"type": "tidelift"
}
],
"time": "2023-12-03T20:05:35+00:00"
"time": "2024-07-18T11:15:46+00:00"
},
{
"name": "knplabs/knp-menu",
@@ -3973,24 +3969,24 @@
},
{
"name": "paragonie/constant_time_encoding",
"version": "v2.7.0",
"version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
"reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105"
"reference": "df1e7fde177501eee2037dd159cf04f5f301a512"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105",
"reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512",
"reference": "df1e7fde177501eee2037dd159cf04f5f301a512",
"shasum": ""
},
"require": {
"php": "^7|^8"
"php": "^8"
},
"require-dev": {
"phpunit/phpunit": "^6|^7|^8|^9",
"vimeo/psalm": "^1|^2|^3|^4"
"phpunit/phpunit": "^9",
"vimeo/psalm": "^4|^5"
},
"type": "library",
"autoload": {
@@ -4036,7 +4032,7 @@
"issues": "https://github.com/paragonie/constant_time_encoding/issues",
"source": "https://github.com/paragonie/constant_time_encoding"
},
"time": "2024-05-08T12:18:48+00:00"
"time": "2024-05-08T12:36:18+00:00"
},
{
"name": "paragonie/random_compat",
@@ -12472,7 +12468,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": ">=7.2.5",
"php": ">=8.2.0",
"ext-ctype": "*",
"ext-iconv": "*"
},

View File

@@ -0,0 +1,3 @@
wopi:
server: "%env(resolve:WOPI_SERVER)%"
enable_lock: false

View File

@@ -11,6 +11,9 @@ framework:
fr: 'Suivi'
support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
initial_marking: 'initial'
marking_store:
type: method
property: step
places:
initial:
metadata:

View File

@@ -7976,10 +7976,10 @@ sass-graph@^4.0.1:
scss-tokenizer "^0.4.3"
yargs "^17.2.1"
sass-loader@^13.0.0:
version "13.3.3"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133"
integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==
sass-loader@^14.0.0:
version "14.2.1"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.1.tgz#db9ad96b56dc1c1ea546101e76375d5b008fec70"
integrity sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==
dependencies:
neo-async "^2.6.2"
@@ -9075,10 +9075,10 @@ vue-multiselect@3.0.0-alpha.2:
resolved "https://registry.yarnpkg.com/vue-multiselect/-/vue-multiselect-3.0.0-alpha.2.tgz#58186f781136e71f1272b98690b569a0c00ed161"
integrity sha512-Xp9fGJECns45v+v8jXbCIsAkCybYkEg0lNwr7Z6HDUSMyx2TEIK2giipPE+qXiShEc1Ipn+ZtttH2iq9hwXP4Q==
vue-toast-notification@^2.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/vue-toast-notification/-/vue-toast-notification-2.0.1.tgz#5fe607c493b5dc9b238bf49bc3bcf80366edd4e4"
integrity sha512-8GPJq1J6lsTPTCxSgPhnM8d0v+ivwT+u4R/xmtaDXeYNRkaRxqFOn3ewaVqmm+aCT8Y3/PQQS8dFqkMV7JOf/A==
vue-toast-notification@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/vue-toast-notification/-/vue-toast-notification-3.1.2.tgz#55106acc4f2c17ecf84468ee9435b97fc7106748"
integrity sha512-oNRL/W9aaHoeScp+iTIW7k09vM16/+8aptp2maa+7qTB43JuxmAgKdXKFYtf+uvSNOYYq2BIWgLCeJ61pwom/A==
vue@^3.2.37:
version "3.4.31"