Compare commits

..

7 Commits

Author SHA1 Message Date
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
12 changed files with 96 additions and 40 deletions

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

@@ -0,0 +1,6 @@
## 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

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

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

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

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

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

@@ -0,0 +1,5 @@
## 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

@@ -0,0 +1,5 @@
kind: Release
body: upgrade chill-bundle to v3.0.0-RC4
time: 2024-07-03T13:38:16.338710196+02:00
custom:
Issue: ""

View File

@@ -0,0 +1,5 @@
kind: Release
body: Add graylog to image
time: 2024-07-03T13:54:12.983732476+02:00
custom:
Issue: ""

View File

@@ -0,0 +1,5 @@
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,6 +6,23 @@ 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
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
* Add graylog to image
## 2.0.0-alpha2 - 2024-07-03
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
## 2.0.0-alpha1 - 2024-07-03 ## 2.0.0-alpha1 - 2024-07-03
### Release ### Release
* Upgrade chill to v2.0.0-RC3 * Upgrade chill to v2.0.0-RC3

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 # 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 \
@@ -16,6 +17,7 @@ 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 \
@@ -26,6 +28,8 @@ 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

@@ -4,13 +4,14 @@
"minimum-stability": "stable", "minimum-stability": "stable",
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"php": ">=7.2.5", "php": ">=8.2.0",
"ext-ctype": "*", "ext-ctype": "*",
"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-RC3", "chill-project/chill-bundles": "v3.0.0-RC5",
"chill-project/chill-deploy": "^1.0", "chill-project/chill-deploy": "^1.0",
"graylog2/gelf-php": "^2.0",
"symfony/console": "5.4.*", "symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*", "symfony/dotenv": "5.4.*",
"symfony/flex": "^1.17|^2", "symfony/flex": "^1.17|^2",

68
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": "e29db7665f176385c33add162f4ca1be", "content-hash": "f0ccb7b37fd87b90bbbb8be921133ee7",
"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-RC3", "version": "v3.0.0-RC5",
"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": "f8fa96d8367d954ade4aebe31c2177ca9499a4fa" "reference": "c82991674e0452fb71a197a924ee63ff453eee0b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=f8fa96d8367d954ade4aebe31c2177ca9499a4fa", "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=c82991674e0452fb71a197a924ee63ff453eee0b",
"reference": "f8fa96d8367d954ade4aebe31c2177ca9499a4fa", "reference": "c82991674e0452fb71a197a924ee63ff453eee0b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -208,7 +208,6 @@
"ext-json": "*", "ext-json": "*",
"ext-openssl": "*", "ext-openssl": "*",
"ext-redis": "*", "ext-redis": "*",
"graylog2/gelf-php": "^1.5",
"knplabs/knp-menu-bundle": "^3.0", "knplabs/knp-menu-bundle": "^3.0",
"knplabs/knp-time-bundle": "^1.12", "knplabs/knp-time-bundle": "^1.12",
"knpuniversity/oauth2-client-bundle": "^2.10", "knpuniversity/oauth2-client-bundle": "^2.10",
@@ -298,6 +297,7 @@
"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,7 +312,8 @@
"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/",
@@ -326,9 +327,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-RC3" "source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/v3.0.0-RC5"
}, },
"time": "2024-06-24T14:23:47+00:00" "time": "2024-07-18T09:49:05+00:00"
}, },
{ {
"name": "chill-project/chill-deploy", "name": "chill-project/chill-deploy",
@@ -2211,36 +2212,31 @@
}, },
{ {
"name": "graylog2/gelf-php", "name": "graylog2/gelf-php",
"version": "1.7.1", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bzikarsky/gelf-php.git", "url": "https://github.com/bzikarsky/gelf-php.git",
"reference": "8dceab86227c184725479cc36ab5cae4da940f6e" "reference": "29ef48fa6eac6c8787b588949483f1739c57ad4f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bzikarsky/gelf-php/zipball/8dceab86227c184725479cc36ab5cae4da940f6e", "url": "https://api.github.com/repos/bzikarsky/gelf-php/zipball/29ef48fa6eac6c8787b588949483f1739c57ad4f",
"reference": "8dceab86227c184725479cc36ab5cae4da940f6e", "reference": "29ef48fa6eac6c8787b588949483f1739c57ad4f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"paragonie/constant_time_encoding": "^1|^2", "php": ">=8.0",
"php": ">=5.6", "psr/log": "^1|^2|^3"
"psr/log": "^1.0|^2.0"
}, },
"provide": { "provide": {
"psr/log-implementation": "~1.0" "psr/log-implementation": "3.0.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7|^6.5|^7.5", "phpunit/phpunit": "^9.6|^10.1",
"squizlabs/php_codesniffer": "^3.3" "squizlabs/php_codesniffer": "^3.6",
"vimeo/psalm": "^5.11"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Gelf\\": "src/Gelf" "Gelf\\": "src/Gelf"
@@ -2253,7 +2249,7 @@
"authors": [ "authors": [
{ {
"name": "Benjamin Zikarsky", "name": "Benjamin Zikarsky",
"email": "benjamin@zikarsky.de" "email": "benjamin@familie-zikarsky.de"
}, },
{ {
"name": "gelf-php contributors", "name": "gelf-php contributors",
@@ -2263,9 +2259,9 @@
"description": "A php implementation to send log-messages to a GELF compatible backend like Graylog2.", "description": "A php implementation to send log-messages to a GELF compatible backend like Graylog2.",
"support": { "support": {
"issues": "https://github.com/bzikarsky/gelf-php/issues", "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", "name": "guzzlehttp/guzzle",
@@ -3973,24 +3969,24 @@
}, },
{ {
"name": "paragonie/constant_time_encoding", "name": "paragonie/constant_time_encoding",
"version": "v2.7.0", "version": "v3.0.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": "52a0d99e69f56b9ec27ace92ba56897fe6993105" "reference": "df1e7fde177501eee2037dd159cf04f5f301a512"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105", "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512",
"reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105", "reference": "df1e7fde177501eee2037dd159cf04f5f301a512",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7|^8" "php": "^8"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6|^7|^8|^9", "phpunit/phpunit": "^9",
"vimeo/psalm": "^1|^2|^3|^4" "vimeo/psalm": "^4|^5"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -4036,7 +4032,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:18:48+00:00" "time": "2024-05-08T12:36:18+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
@@ -12472,7 +12468,7 @@
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=7.2.5", "php": ">=8.2.0",
"ext-ctype": "*", "ext-ctype": "*",
"ext-iconv": "*" "ext-iconv": "*"
}, },

View File

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