Compare commits

..

No commits in common. "79e7a639410639522215f8bede806a6d50bdeef3" and "218b08a3c48a36c684bc36814afd6ef93151342a" have entirely different histories.

8 changed files with 19 additions and 50 deletions

View File

@ -1,6 +0,0 @@
## 2.0.0-RC1 - 2024-07-18
### 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

View File

@ -1,5 +0,0 @@
## 2.0.0-alpha4 - 2024-07-03
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
* Add graylog to image

View File

@ -1,5 +0,0 @@
kind: Release
body: upgrade to chill-bundles/3.0.0-RC5
time: 2024-07-18T10:39:18.226486987+02:00
custom:
Issue: ""

View File

@ -6,12 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie). and is generated by [Changie](https://github.com/miniscruff/changie).
## 2.0.0-alpha4 - 2024-07-03
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
* Add graylog to image
## 2.0.0-alpha3 - 2024-07-03 ## 2.0.0-alpha3 - 2024-07-03
### Release ### Release
* Upgrade chill to v3.0.0-RC3 * Upgrade chill to v3.0.0-RC3

View File

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

View File

@ -9,7 +9,7 @@
"ext-iconv": "*", "ext-iconv": "*",
"champs-libres/wopi-bundle": "dev-master@dev", "champs-libres/wopi-bundle": "dev-master@dev",
"champs-libres/wopi-lib": "dev-master@dev", "champs-libres/wopi-lib": "dev-master@dev",
"chill-project/chill-bundles": "v3.0.0-RC5", "chill-project/chill-bundles": "v3.0.0-RC4",
"chill-project/chill-deploy": "^1.0", "chill-project/chill-deploy": "^1.0",
"graylog2/gelf-php": "^2.0", "graylog2/gelf-php": "^2.0",
"symfony/console": "5.4.*", "symfony/console": "5.4.*",

34
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "f0ccb7b37fd87b90bbbb8be921133ee7", "content-hash": "6f8866c29c800c279eba1cddda061a38",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
@ -185,16 +185,16 @@
}, },
{ {
"name": "chill-project/chill-bundles", "name": "chill-project/chill-bundles",
"version": "v3.0.0-RC5", "version": "v3.0.0-RC4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://gitlab.com/Chill-Projet/chill-bundles.git", "url": "https://gitlab.com/Chill-Projet/chill-bundles.git",
"reference": "c82991674e0452fb71a197a924ee63ff453eee0b" "reference": "ead1abb825dbfeaefeb9c2f853a52c41c37db956"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=c82991674e0452fb71a197a924ee63ff453eee0b", "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=ead1abb825dbfeaefeb9c2f853a52c41c37db956",
"reference": "c82991674e0452fb71a197a924ee63ff453eee0b", "reference": "ead1abb825dbfeaefeb9c2f853a52c41c37db956",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -297,7 +297,6 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Chill\\JobBundle\\": "src/Bundle/ChillJobBundle/src",
"Chill\\MainBundle\\": "src/Bundle/ChillMainBundle", "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
"Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
"Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src", "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
@ -312,8 +311,7 @@
"Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
"Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle", "Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle",
"Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle", "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/", "notification-url": "https://packagist.org/downloads/",
@ -327,9 +325,9 @@
], ],
"support": { "support": {
"issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues", "issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues",
"source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/v3.0.0-RC5" "source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/v3.0.0-RC4"
}, },
"time": "2024-07-18T09:49:05+00:00" "time": "2024-07-03T13:29:22+00:00"
}, },
{ {
"name": "chill-project/chill-deploy", "name": "chill-project/chill-deploy",
@ -3969,24 +3967,24 @@
}, },
{ {
"name": "paragonie/constant_time_encoding", "name": "paragonie/constant_time_encoding",
"version": "v3.0.0", "version": "v2.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git", "url": "https://github.com/paragonie/constant_time_encoding.git",
"reference": "df1e7fde177501eee2037dd159cf04f5f301a512" "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512", "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105",
"reference": "df1e7fde177501eee2037dd159cf04f5f301a512", "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^8" "php": "^7|^8"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9", "phpunit/phpunit": "^6|^7|^8|^9",
"vimeo/psalm": "^4|^5" "vimeo/psalm": "^1|^2|^3|^4"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -4032,7 +4030,7 @@
"issues": "https://github.com/paragonie/constant_time_encoding/issues", "issues": "https://github.com/paragonie/constant_time_encoding/issues",
"source": "https://github.com/paragonie/constant_time_encoding" "source": "https://github.com/paragonie/constant_time_encoding"
}, },
"time": "2024-05-08T12:36:18+00:00" "time": "2024-05-08T12:18:48+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",

View File

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