Update Chill to v2.2.0 with bundles v3.1.1

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.

.changes/2.0.0-RC1.md

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

.changes/2.0.0-RC2.md

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

.changes/2.0.0-RC3.md

@@ -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

.changes/2.0.0-RC4.md

@@ -0,0 +1,3 @@
+## 2.2.0 - 2024-07-25
+### Release
+* Update chill-bundles to v3.0.0-RC7

.changes/2.0.0-RC5.md

@@ -0,0 +1,3 @@
+## 2.1.0 - 2024-07-30
+### Release
+* Update chill-bundles to v3.0.0-RC8

.changes/2.0.0-RC6.md

@@ -0,0 +1,3 @@
+## 2.1.0 - 2024-08-08
+### Release
+* Update chill-bundles to v3.0.0-RC9

.changes/2.0.0-alpha1.md

@@ -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

.changes/2.0.0-alpha2.md

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

.changes/2.0.0-alpha3.md

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

.changes/2.0.0-alpha4.md

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

.changes/2.1.0.md

@@ -0,0 +1,3 @@
+## 2.1.0 - 2024-09-24
+### Release
+* Update bundles version to 3.1.0

.changes/2.2.0.md

@@ -0,0 +1,3 @@
+## 2.2.0 - 2024-10-01
+### Release
+* Bundles version updated to 3.1.1

.changes/unreleased/Release-20240703-124635.yaml

@@ -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: ""

.env

@@ -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 ###

CHANGELOG.md

@@ -6,6 +6,56 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 2.2.0 - 2024-10-01
+### Release
+* Bundles version updated to 3.1.1
+
+## 2.1.0 - 2024-09-24
+### Release
+* Update bundles version to 3.1.0
+
+## 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.1.0 - 2024-08-08
+### Release
+* Update chill-bundles to v3.0.0-RC9
+
+## 2.1.0 - 2024-07-30
+### Release
+* Update chill-bundles to v3.0.0-RC8
+
+## 2.2.0 - 2024-07-25
+### Release
+* Update chill-bundles to v3.0.0-RC7
+
+## 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-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

Dockerfile

@@ -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 \

composer.json

@@ -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.1.1@dev",
     "chill-project/chill-deploy": "^1.0",
+    "graylog2/gelf-php": "^2.0",
     "symfony/console": "5.4.*",
     "symfony/dotenv": "5.4.*",
     "symfony/flex": "^1.17|^2",

config/packages/wopi.yaml

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

config/packages/workflow.yaml

@@ -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:

package.json

@@ -10,5 +10,8 @@
     "specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs": "yarn run specs-build && yarn run specs-validate"
+  },
+  "dependencies": {
+    "bootstrap-icons": "^1.11.3"
   }
 }

yarn.lock

@@ -3367,6 +3367,11 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+bootstrap-icons@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz#03f9cb754ec005c52f9ee616e2e84a82cab3084b"
+  integrity sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==
+
 bootstrap@5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b"
@@ -7976,10 +7981,10 @@ sass-graph@^4.0.1:
     scss-tokenizer "^0.4.3"
     yargs "^17.2.1"
 
-sass-loader@^13.0.0:
+sass-loader@^14.0.0:
-  version "13.3.3"
+  version "14.2.1"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.1.tgz#db9ad96b56dc1c1ea546101e76375d5b008fec70"
-  integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==
+  integrity sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==
   dependencies:
     neo-async "^2.6.2"
 
@@ -9075,10 +9080,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:
+vue-toast-notification@^3.1.2:
-  version "2.0.1"
+  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/vue-toast-notification/-/vue-toast-notification-2.0.1.tgz#5fe607c493b5dc9b238bf49bc3bcf80366edd4e4"
+  resolved "https://registry.yarnpkg.com/vue-toast-notification/-/vue-toast-notification-3.1.2.tgz#55106acc4f2c17ecf84468ee9435b97fc7106748"
-  integrity sha512-8GPJq1J6lsTPTCxSgPhnM8d0v+ivwT+u4R/xmtaDXeYNRkaRxqFOn3ewaVqmm+aCT8Y3/PQQS8dFqkMV7JOf/A==
+  integrity sha512-oNRL/W9aaHoeScp+iTIW7k09vM16/+8aptp2maa+7qTB43JuxmAgKdXKFYtf+uvSNOYYq2BIWgLCeJ61pwom/A==
 
 vue@^3.2.37:
   version "3.4.31"