Compare commits

...

17 Commits

Author SHA1 Message Date
207f8b9118 Update bundles version to v3.0.0-RC9
All checks were successful
continuous-integration/drone/tag Build is passing
2024-08-08 11:29:04 +02:00
73c1e7a17a Update chill-bundles to version 3.0.0-RC8
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-30 15:10:30 +02:00
e399ee3a34 Fix naming of changie files
All checks were successful
continuous-integration/drone/tag Build is passing
2024-07-25 17:06:13 +02:00
190ff0b0a6 Add changie file: upgrade chill-bundles to v3.0.0-RC7 2024-07-25 17:02:19 +02:00
cfb2dcfd31 Update chill-bundles to v3.0.0-RC7 2024-07-25 17:00:23 +02:00
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
18 changed files with 302 additions and 227 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

9
.changes/2.0.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

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

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

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

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

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

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,48 @@ 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-08-08
### Release
* Update chill-bundles to v3.0.0-RC9
## 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-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

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

412
composer.lock generated

File diff suppressed because it is too large Load Diff

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"