Compare commits
5 Commits
03de4e5cc7
...
96dd6e190a
Author | SHA1 | Date | |
---|---|---|---|
96dd6e190a | |||
7e825bb46a | |||
ac051664af | |||
f2d81c46da | |||
e27fcdfb71 |
3
.changes/2.0.0-alpha1.md
Normal file
3
.changes/2.0.0-alpha1.md
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
## 3.0.0-alpha1 - 2024-07-03
|
||||||
|
### Release
|
||||||
|
* Upgrade chill to v3.0.0-RC3
|
6
.changes/header.tpl.md
Normal file
6
.changes/header.tpl.md
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
# Changelog
|
||||||
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
|
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
||||||
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
0
.changes/unreleased/.gitkeep
Normal file
0
.changes/unreleased/.gitkeep
Normal file
5
.changes/unreleased/Release-20240703-124635.yaml
Normal file
5
.changes/unreleased/Release-20240703-124635.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
kind: Release
|
||||||
|
body: Upgrade chill to v3.0.0-RC3
|
||||||
|
time: 2024-07-03T12:46:35.963251524+02:00
|
||||||
|
custom:
|
||||||
|
Issue: ""
|
35
.changie.yaml
Normal file
35
.changie.yaml
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
changesDir: .changes
|
||||||
|
unreleasedDir: unreleased
|
||||||
|
headerPath: header.tpl.md
|
||||||
|
changelogPath: CHANGELOG.md
|
||||||
|
versionExt: md
|
||||||
|
versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
|
||||||
|
kindFormat: '### {{.Kind}}'
|
||||||
|
# Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
|
||||||
|
changeFormat: >-
|
||||||
|
* {{ if and (ne .Custom.Issue "") (ne .Custom.Issue "0") }}([#{{ .Custom.Issue }}](https://gitea.champs-libres.be/Chill-project/chill-base-app-v3/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}}
|
||||||
|
custom:
|
||||||
|
- key: Issue
|
||||||
|
label: Issue number (on chill-bundles repository) (optional)
|
||||||
|
optional: true
|
||||||
|
type: int
|
||||||
|
kinds:
|
||||||
|
- label: Release
|
||||||
|
auto: minor
|
||||||
|
- label: Feature
|
||||||
|
auto: minor
|
||||||
|
- label: Deprecated
|
||||||
|
auto: minor
|
||||||
|
- label: Fixed
|
||||||
|
auto: patch
|
||||||
|
- label: Security
|
||||||
|
auto: patch
|
||||||
|
- label: DX
|
||||||
|
auto: patch
|
||||||
|
- label: UX
|
||||||
|
auto: patch
|
||||||
|
newlines:
|
||||||
|
afterChangelogHeader: 1
|
||||||
|
beforeChangelogVersion: 1
|
||||||
|
endOfVersion: 1
|
||||||
|
envPrefix: CHANGIE_
|
13
.dockerignore
Normal file
13
.dockerignore
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
vendor/*/*/vendor/*
|
||||||
|
vendor/*/*/tests/*
|
||||||
|
vendor/bin/.php*
|
||||||
|
.pgadmin4*
|
||||||
|
app/config/parameters.yml
|
||||||
|
.composer*
|
||||||
|
.git*
|
||||||
|
.yarncache/*
|
||||||
|
.node_modules/*
|
||||||
|
build/*
|
||||||
|
var/*
|
||||||
|
vendor/chill-project/chill-bundles/.psalm/*
|
||||||
|
|
86
.drone.yml
Normal file
86
.drone.yml
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: build-images
|
||||||
|
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfig
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- tag
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: build-base-image
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
|
registry: h3m6q87t.gra7.container-registry.ovh.net
|
||||||
|
repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base
|
||||||
|
tag: latest
|
||||||
|
target: chill_base_php82
|
||||||
|
pull_image: true
|
||||||
|
cache_from:
|
||||||
|
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
|
||||||
|
- chill/base-image:latest
|
||||||
|
|
||||||
|
- name: composer-install
|
||||||
|
image: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
|
||||||
|
pull: always
|
||||||
|
commands:
|
||||||
|
- composer install --no-scripts --no-interaction
|
||||||
|
depends_on:
|
||||||
|
- build-base-image
|
||||||
|
|
||||||
|
- name: build-assets
|
||||||
|
image: node:20
|
||||||
|
pull: always
|
||||||
|
commands:
|
||||||
|
- yarn install
|
||||||
|
- yarn list
|
||||||
|
- yarn run encore production
|
||||||
|
depends_on:
|
||||||
|
- composer-install
|
||||||
|
|
||||||
|
- name: build-image-php
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
pull_image: true
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
|
registry: h3m6q87t.gra7.container-registry.ovh.net
|
||||||
|
repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php
|
||||||
|
tag:
|
||||||
|
- ${DRONE_TAG}
|
||||||
|
cache_from:
|
||||||
|
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
|
||||||
|
- chill/base-image:latest
|
||||||
|
depends_on:
|
||||||
|
- build-assets
|
||||||
|
- composer-install
|
||||||
|
|
||||||
|
- name: build-image-nginx
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
pull_image: true
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
|
registry: h3m6q87t.gra7.container-registry.ovh.net
|
||||||
|
repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/nginx
|
||||||
|
tag:
|
||||||
|
- ${DRONE_TAG}
|
||||||
|
Dockerfile: docker/nginx/Dockerfile
|
||||||
|
depends_on:
|
||||||
|
- build-assets
|
||||||
|
---
|
||||||
|
kind: signature
|
||||||
|
hmac: 510f151634e776218c6135bb830480fe0c265eb1dd96c16ef640001a23f351ae
|
||||||
|
|
||||||
|
...
|
59
.gitea/workflows/release/update-composer-lock.yaml
Normal file
59
.gitea/workflows/release/update-composer-lock.yaml
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
name: Prepare release for chill app
|
||||||
|
run-name: Update composer.lock and dependencies for preparing a release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- 'release/**'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update-deps:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: check out repository
|
||||||
|
uses: https://github.com/actions/checkout@v4
|
||||||
|
- name: get the previous chill version
|
||||||
|
# parse the composer.lock file using jq to get the chill version before the upgrade
|
||||||
|
id: chill-before
|
||||||
|
uses: https://github.com/sergeysova/jq-action@v2
|
||||||
|
with:
|
||||||
|
cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
|
||||||
|
- name: run composer update to update composer.lock
|
||||||
|
uses: docker://gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest
|
||||||
|
with:
|
||||||
|
# this is where we set the command to execute
|
||||||
|
args: composer update --no-install
|
||||||
|
- name: is composer.lock changed ?
|
||||||
|
id: composer-lock-changed
|
||||||
|
run: 'echo is_composer_lock_changed=$(git diff --name-only | grep "composer\.lock" | wc -l) >> $GITHUB_OUTPUT'
|
||||||
|
- name: get the new chill version
|
||||||
|
# parse the composer.lock file using jq to get the chill version after the upgrade
|
||||||
|
id: chill-after
|
||||||
|
uses: https://github.com/sergeysova/jq-action@v2
|
||||||
|
with:
|
||||||
|
cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
|
||||||
|
- name: add a changie file for the upgrade
|
||||||
|
uses: https://github.com/miniscruff/changie-action@v2
|
||||||
|
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
|
||||||
|
with:
|
||||||
|
version: latest
|
||||||
|
args: 'new --body "Update dependencies. Chill-bundles upgraded from ${{ steps.chill-before.outputs.value }} to ${{ steps.chill-after.outputs.value }}" --kind Release --custom "Issue=0"'
|
||||||
|
- name: changie batch
|
||||||
|
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
|
||||||
|
uses: https://github.com/miniscruff/changie-action@v2
|
||||||
|
with:
|
||||||
|
version: latest
|
||||||
|
args: 'batch auto'
|
||||||
|
- name: changie merge
|
||||||
|
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
|
||||||
|
uses: https://github.com/miniscruff/changie-action@v2
|
||||||
|
with:
|
||||||
|
version: latest
|
||||||
|
args: 'merge'
|
||||||
|
- name: commit changed files
|
||||||
|
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
|
||||||
|
uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
|
||||||
|
with:
|
||||||
|
commit_message: "update composer.lock and file (automatic update)"
|
||||||
|
commit_user_name: Action Bot
|
||||||
|
commit_user_email: bot@chill.social
|
11
CHANGELOG.md
Normal file
11
CHANGELOG.md
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# Changelog
|
||||||
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
|
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
||||||
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
||||||
|
|
||||||
|
|
||||||
|
## 3.0.0-alpha1 - 2024-07-03
|
||||||
|
### Release
|
||||||
|
* Upgrade chill to v3.0.0-RC3
|
102
Dockerfile
Normal file
102
Dockerfile
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
FROM php:8.2-fpm-alpine AS chill_base_php82
|
||||||
|
|
||||||
|
ENV POSTGRES_VERSION 14
|
||||||
|
|
||||||
|
# default UID for the PHP user
|
||||||
|
ARG UID=1000
|
||||||
|
ARG GID=1000
|
||||||
|
|
||||||
|
# install php extensions and deps
|
||||||
|
RUN apk update && apk add --no-cache \
|
||||||
|
wget gnupg \
|
||||||
|
libpq-dev \
|
||||||
|
icu-dev icu-libs icu-data-full \
|
||||||
|
oniguruma-dev \
|
||||||
|
libzip libzip-dev \
|
||||||
|
linux-headers \
|
||||||
|
gcc g++ make autoconf \
|
||||||
|
bash git \
|
||||||
|
&& docker-php-ext-install pdo_pgsql intl mbstring zip bcmath exif sockets \
|
||||||
|
&& git clone https://github.com/nikic/php-ast.git \
|
||||||
|
&& cd php-ast \
|
||||||
|
&& phpize \
|
||||||
|
&& ./configure \
|
||||||
|
&& make install \
|
||||||
|
&& echo 'extension=ast.so' > /usr/local/etc/php/php.ini \
|
||||||
|
&& cd .. && rm -rf php-ast \
|
||||||
|
&& pecl install redis \
|
||||||
|
&& docker-php-ext-enable redis \
|
||||||
|
&& 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 \
|
||||||
|
&& apk add postgresql${POSTGRES_VERSION}-client \
|
||||||
|
&& apk del --purge wget gnupg libpq-dev icu-dev oniguruma-dev libzip-dev linux-headers gcc g++ make autoconf
|
||||||
|
|
||||||
|
RUN { \
|
||||||
|
echo ""; \
|
||||||
|
echo "memory_limit = 512M"; \
|
||||||
|
echo ""; \
|
||||||
|
} >> /usr/local/etc/php/conf.d/memory_limit.ini
|
||||||
|
|
||||||
|
RUN { \
|
||||||
|
echo ""; \
|
||||||
|
echo "[Date]"; \
|
||||||
|
echo "date.timezone = Europe/Brussels"; \
|
||||||
|
echo ""; \
|
||||||
|
} >> /usr/local/etc/php/conf.d/date.ini
|
||||||
|
|
||||||
|
# temporary fix, while php-cs-fixer has conflict dependencies
|
||||||
|
# with chill
|
||||||
|
RUN curl -o /usr/local/bin/php-cs-fixer https://cs.symfony.com/download/php-cs-fixer-v3.phar \
|
||||||
|
&& chmod +x /usr/local/bin/php-cs-fixer
|
||||||
|
# to make php-cs-fixer works with php 8.2
|
||||||
|
ENV PHP_CS_FIXER_IGNORE_ENV=1
|
||||||
|
|
||||||
|
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
|
||||||
|
ENV COMPOSER_ALLOW_SUPERUSER=1
|
||||||
|
ENV COMPOSER_MEMORY_LIMIT=-1
|
||||||
|
|
||||||
|
# shell bash preference
|
||||||
|
RUN sed -i " \
|
||||||
|
s|root:x:0:0:root:/root:/bin/ash|root:x:0:0:root:/root:/bin/bash|g; \
|
||||||
|
s|postgres:x:70:70:PostgreSQL user:/var/lib/postgresql:/bin/sh|postgres:x:70:70:PostgreSQL user:/var/lib/postgresql:/bin/bash|g" \
|
||||||
|
/etc/passwd
|
||||||
|
|
||||||
|
# chmod on redis.so
|
||||||
|
RUN chmod 755 -R /usr/local/lib/php/extensions/
|
||||||
|
|
||||||
|
WORKDIR /var/www/app
|
||||||
|
|
||||||
|
CMD ["php-fpm"]
|
||||||
|
|
||||||
|
FROM chill_base_php82 AS chill_php82
|
||||||
|
|
||||||
|
# copy directories
|
||||||
|
|
||||||
|
COPY ./bin /var/www/app/bin/.
|
||||||
|
COPY ./composer.* /var/www/app/
|
||||||
|
COPY ./config /var/www/app/config/.
|
||||||
|
COPY ./migrations /var/www/app/migrations/.
|
||||||
|
COPY ./public /var/www/app/public/.
|
||||||
|
COPY ./src /var/www/app/src/.
|
||||||
|
COPY ./templates /var/www/app/templates/.
|
||||||
|
COPY ./translations /var/www/app/translations/.
|
||||||
|
COPY ./vendor /var/www/app/vendor/.
|
||||||
|
|
||||||
|
COPY ./.env /var/www/app/.env
|
||||||
|
|
||||||
|
# import the manifest.json file
|
||||||
|
COPY ./public/build/manifest.json /var/www/app/public/build/manifest.json
|
||||||
|
|
||||||
|
ADD ./entrypoint.sh /.
|
||||||
|
|
||||||
|
RUN chmod +x /entrypoint.sh
|
||||||
|
|
||||||
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
|
|
||||||
|
ENV PHP_FPM_USER=www-data \
|
||||||
|
PHP_FPM_GROUP=www-data \
|
||||||
|
COMPOSER_HOME=/var/www/app/.composer \
|
||||||
|
SESSION_LIFETIME=10800
|
||||||
|
|
||||||
|
CMD [ "php-fpm" ]
|
@ -10,6 +10,7 @@
|
|||||||
"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-RC3",
|
||||||
|
"chill-project/chill-deploy": "^1.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",
|
||||||
|
34
composer.lock
generated
34
composer.lock
generated
@ -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": "ff6df1a73b9d5656e2e4a9c02d2bcdcf",
|
"content-hash": "e29db7665f176385c33add162f4ca1be",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "brick/math",
|
"name": "brick/math",
|
||||||
@ -330,6 +330,38 @@
|
|||||||
},
|
},
|
||||||
"time": "2024-06-24T14:23:47+00:00"
|
"time": "2024-06-24T14:23:47+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "chill-project/chill-deploy",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://gitlab.com/Chill-Projet/chill-deploy.git",
|
||||||
|
"reference": "761bbdc59190b076b1b16d699c27be57d6b47d8a"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-deploy/repository/archive.zip?sha=761bbdc59190b076b1b16d699c27be57d6b47d8a",
|
||||||
|
"reference": "761bbdc59190b076b1b16d699c27be57d6b47d8a",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"type": "metapackage",
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"AGPL-3.0-only"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Julien Fastré",
|
||||||
|
"email": "julien.fastre@champs-libres.coop"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "A meta-package which will trigger installation of opiniated files to deploy chill using docker, and running ci",
|
||||||
|
"support": {
|
||||||
|
"issues": "https://gitlab.com/Chill-Projet/chill-deploy/-/issues",
|
||||||
|
"source": "https://gitlab.com/Chill-Projet/chill-deploy/-/tree/1.0.0"
|
||||||
|
},
|
||||||
|
"time": "2024-05-02T16:15:41+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/package-versions-deprecated",
|
"name": "composer/package-versions-deprecated",
|
||||||
"version": "1.11.99.5",
|
"version": "1.11.99.5",
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
lexik_jwt_authentication:
|
lexik_jwt_authentication:
|
||||||
secret_key: '%env(resolve:JWT_SECRET_KEY)%'
|
secret_key: '%env(resolve:JWT_SECRET_KEY)%'
|
||||||
public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
|
public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
|
||||||
pass_phrase: '%env(JWT_PASSPHRASE)%'
|
pass_phrase: '%env(JWT_PASSPHRASE)%'
|
8
config/packages/lexik_jwt_authentication_chill.yaml
Normal file
8
config/packages/lexik_jwt_authentication_chill.yaml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
lexik_jwt_authentication:
|
||||||
|
# required for wopi - recommended duration
|
||||||
|
token_ttl: 36000
|
||||||
|
|
||||||
|
token_extractors:
|
||||||
|
query_parameter:
|
||||||
|
enabled: true
|
||||||
|
name: access_token
|
@ -1,7 +1,4 @@
|
|||||||
framework:
|
framework:
|
||||||
default_locale: en
|
|
||||||
translator:
|
translator:
|
||||||
default_path: '%kernel.project_dir%/translations'
|
default_path: '%kernel.project_dir%/translations'
|
||||||
fallbacks:
|
|
||||||
- en
|
|
||||||
providers:
|
providers:
|
||||||
|
@ -1,2 +1,291 @@
|
|||||||
framework:
|
framework:
|
||||||
workflows: null
|
workflows:
|
||||||
|
vendee_internal:
|
||||||
|
type: state_machine
|
||||||
|
metadata:
|
||||||
|
related_entity:
|
||||||
|
- Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument
|
||||||
|
- Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
|
||||||
|
- Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
|
||||||
|
label:
|
||||||
|
fr: 'Suivi'
|
||||||
|
support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
|
||||||
|
initial_marking: 'initial'
|
||||||
|
places:
|
||||||
|
initial:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: Étape initiale
|
||||||
|
attenteModification:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: En attente de modification du document
|
||||||
|
validationFilterInputLabels:
|
||||||
|
forward: {fr: Modification effectuée}
|
||||||
|
backward: {fr: Pas de modification effectuée}
|
||||||
|
neutral: {fr: Autre}
|
||||||
|
attenteMiseEnForme:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: En attente de mise en forme
|
||||||
|
validationFilterInputLabels:
|
||||||
|
forward: {fr: Mise en forme terminée}
|
||||||
|
backward: {fr: Pas de mise en forme effectuée}
|
||||||
|
neutral: {fr: Autre}
|
||||||
|
attenteVisa:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: En attente de visa
|
||||||
|
validationFilterInputLabels:
|
||||||
|
forward: {fr: Visa accordé}
|
||||||
|
backward: {fr: Visa refusé}
|
||||||
|
neutral: {fr: Autre}
|
||||||
|
attenteSignature:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: En attente de signature
|
||||||
|
validationFilterInputLabels:
|
||||||
|
forward: {fr: Signature accordée}
|
||||||
|
backward: {fr: Signature refusée}
|
||||||
|
neutral: {fr: Autre}
|
||||||
|
attenteTraitement:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: En attente de traitement
|
||||||
|
validationFilterInputLabels:
|
||||||
|
forward: {fr: Traitement terminé favorablement}
|
||||||
|
backward: {fr: Traitement terminé défavorablement}
|
||||||
|
neutral: {fr: Autre}
|
||||||
|
attenteEnvoi:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: En attente d'envoi
|
||||||
|
validationFilterInputLabels:
|
||||||
|
forward: {fr: Document envoyé}
|
||||||
|
backward: {fr: Document non envoyé}
|
||||||
|
neutral: {fr: Autre}
|
||||||
|
attenteValidationMiseEnForme:
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: En attente de validation de la mise en forme
|
||||||
|
validationFilterInputLabels:
|
||||||
|
forward: {fr: Validation de la mise en forme}
|
||||||
|
backward: {fr: Refus de validation de la mise en forme}
|
||||||
|
neutral: {fr: Autre}
|
||||||
|
annule:
|
||||||
|
metadata:
|
||||||
|
isFinal: true
|
||||||
|
isFinalPositive: false
|
||||||
|
label:
|
||||||
|
fr: Annulé
|
||||||
|
final:
|
||||||
|
metadata:
|
||||||
|
isFinal: true
|
||||||
|
isFinalPositive: true
|
||||||
|
label:
|
||||||
|
fr: Finalisé
|
||||||
|
transitions:
|
||||||
|
# transition qui avancent
|
||||||
|
demandeModificationDocument:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
to: attenteModification
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: Demande de modification du document
|
||||||
|
isForward: true
|
||||||
|
demandeMiseEnForme:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
- attenteModification
|
||||||
|
to: attenteMiseEnForme
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: Demande de mise en forme
|
||||||
|
isForward: true
|
||||||
|
demandeValidationMiseEnForme:
|
||||||
|
from:
|
||||||
|
- attenteMiseEnForme
|
||||||
|
to: attenteValidationMiseEnForme
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: Demande de validation de la mise en forme
|
||||||
|
isForward: true
|
||||||
|
demandeVisa:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
- attenteModification
|
||||||
|
- attenteMiseEnForme
|
||||||
|
- attenteValidationMiseEnForme
|
||||||
|
to: attenteVisa
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: Demande de visa
|
||||||
|
isForward: true
|
||||||
|
demandeSignature:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
- attenteModification
|
||||||
|
- attenteMiseEnForme
|
||||||
|
- attenteValidationMiseEnForme
|
||||||
|
- attenteVisa
|
||||||
|
to: attenteSignature
|
||||||
|
metadata:
|
||||||
|
label: {fr: Demande de signature}
|
||||||
|
isForward: true
|
||||||
|
demandeTraitement:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
- attenteModification
|
||||||
|
- attenteMiseEnForme
|
||||||
|
- attenteValidationMiseEnForme
|
||||||
|
- attenteVisa
|
||||||
|
- attenteSignature
|
||||||
|
to: attenteTraitement
|
||||||
|
metadata:
|
||||||
|
label: {fr: Demande de traitement}
|
||||||
|
isForward: true
|
||||||
|
demandeEnvoi:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
- attenteModification
|
||||||
|
- attenteMiseEnForme
|
||||||
|
- attenteValidationMiseEnForme
|
||||||
|
- attenteVisa
|
||||||
|
- attenteSignature
|
||||||
|
- attenteTraitement
|
||||||
|
to: attenteEnvoi
|
||||||
|
metadata:
|
||||||
|
label: {fr: Demande d'envoi}
|
||||||
|
isForward: true
|
||||||
|
annulation:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
- attenteModification
|
||||||
|
- attenteMiseEnForme
|
||||||
|
- attenteValidationMiseEnForme
|
||||||
|
- attenteVisa
|
||||||
|
- attenteSignature
|
||||||
|
- attenteTraitement
|
||||||
|
- attenteEnvoi
|
||||||
|
to: annule
|
||||||
|
metadata:
|
||||||
|
label: {fr: Annulation}
|
||||||
|
isForward: false
|
||||||
|
# transitions qui répètent l'étape
|
||||||
|
demandeMiseEnFormeSupplementaire:
|
||||||
|
from:
|
||||||
|
- attenteMiseEnForme
|
||||||
|
- attenteValidationMiseEnForme
|
||||||
|
to: attenteMiseEnForme
|
||||||
|
metadata:
|
||||||
|
label: {fr: Demande de mise en forme supplémentaire}
|
||||||
|
demandeVisaSupplementaire:
|
||||||
|
from:
|
||||||
|
- attenteVisa
|
||||||
|
to: attenteVisa
|
||||||
|
metadata:
|
||||||
|
label: {fr: Demande de visa supplémentaire}
|
||||||
|
isForward: true
|
||||||
|
demandeSignatureSupplementaire:
|
||||||
|
from:
|
||||||
|
- attenteSignature
|
||||||
|
to: attenteSignature
|
||||||
|
metadata:
|
||||||
|
label: {fr: Demande de signature supplémentaire}
|
||||||
|
demandeTraitementSupplementaire:
|
||||||
|
from:
|
||||||
|
- attenteTraitement
|
||||||
|
to: attenteTraitement
|
||||||
|
metadata:
|
||||||
|
label: {fr: Demande de traitement supplémentaire}
|
||||||
|
# transitions qui renvoient vers une étape précédente
|
||||||
|
refusEtModificationDocument:
|
||||||
|
from:
|
||||||
|
- attenteVisa
|
||||||
|
- attenteSignature
|
||||||
|
- attenteTraitement
|
||||||
|
- attenteEnvoi
|
||||||
|
to: attenteModification
|
||||||
|
metadata:
|
||||||
|
label:
|
||||||
|
fr: Refus et demande de modification du document
|
||||||
|
isForward: false
|
||||||
|
refusEtDemandeMiseEnForme:
|
||||||
|
from:
|
||||||
|
- attenteVisa
|
||||||
|
- attenteSignature
|
||||||
|
- attenteTraitement
|
||||||
|
- attenteEnvoi
|
||||||
|
to: attenteMiseEnForme
|
||||||
|
metadata:
|
||||||
|
label: {fr: Refus et demande de mise en forme}
|
||||||
|
isForward: false
|
||||||
|
refusEtDemandeVisa:
|
||||||
|
from:
|
||||||
|
- attenteSignature
|
||||||
|
- attenteTraitement
|
||||||
|
- attenteEnvoi
|
||||||
|
to: attenteVisa
|
||||||
|
metadata:
|
||||||
|
label: {fr: Refus et demande de visa}
|
||||||
|
isForward: false
|
||||||
|
refusEtDemandeSignature:
|
||||||
|
from:
|
||||||
|
- attenteTraitement
|
||||||
|
- attenteEnvoi
|
||||||
|
to: attenteSignature
|
||||||
|
metadata:
|
||||||
|
label: {fr: Refus et demande de signature}
|
||||||
|
isForward: false
|
||||||
|
refusEtDemandeTraitement:
|
||||||
|
from:
|
||||||
|
- attenteEnvoi
|
||||||
|
to: attenteTraitement
|
||||||
|
metadata:
|
||||||
|
label: {fr: Refus et demande de traitement}
|
||||||
|
isForward: false
|
||||||
|
# transition vers final
|
||||||
|
initialToFinal:
|
||||||
|
from:
|
||||||
|
- initial
|
||||||
|
to: final
|
||||||
|
metadata:
|
||||||
|
label: {fr: Clotûre immédiate et cloture positive}
|
||||||
|
isForward: true
|
||||||
|
attenteMiseEnFormeToFinal:
|
||||||
|
from:
|
||||||
|
- attenteMiseEnForme
|
||||||
|
- attenteValidationMiseEnForme
|
||||||
|
to: final
|
||||||
|
metadata:
|
||||||
|
label: {fr: Mise en forme terminée et cloture positive}
|
||||||
|
isForward: true
|
||||||
|
attenteVisaToFinal:
|
||||||
|
from:
|
||||||
|
- attenteVisa
|
||||||
|
to: final
|
||||||
|
metadata:
|
||||||
|
label: {fr: Accorde le visa et cloture positive}
|
||||||
|
isForward: true
|
||||||
|
attenteSignatureToFinal:
|
||||||
|
from:
|
||||||
|
- attenteSignature
|
||||||
|
to: final
|
||||||
|
metadata:
|
||||||
|
label: {fr: Accorde la signature et cloture positive}
|
||||||
|
isForward: true
|
||||||
|
attenteTraitementToFinal:
|
||||||
|
from:
|
||||||
|
- attenteTraitement
|
||||||
|
to: final
|
||||||
|
metadata:
|
||||||
|
label: {fr: Traitement terminé et cloture postive}
|
||||||
|
isForward: true
|
||||||
|
attenteEnvoiToFinal:
|
||||||
|
from:
|
||||||
|
- attenteEnvoi
|
||||||
|
to: final
|
||||||
|
metadata:
|
||||||
|
label: {fr: Envoyé et cloture postive}
|
||||||
|
isForward: true
|
||||||
|
@ -0,0 +1,2 @@
|
|||||||
|
CREATE EXTENSION UNACCENT;
|
||||||
|
|
8
docker/logstash/Dockerfile
Normal file
8
docker/logstash/Dockerfile
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
FROM docker.elastic.co/logstash/logstash-oss:8.1.0-amd64
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
bin/logstash-plugin install logstash-output-gelf \
|
||||||
|
&& bin/logstash-plugin install logstash-input-gelf
|
||||||
|
|
||||||
|
COPY ./pipeline /usr/share/logstash/pipeline/
|
||||||
|
|
16
docker/logstash/pipeline/logstash.conf
Normal file
16
docker/logstash/pipeline/logstash.conf
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
input {
|
||||||
|
gelf {
|
||||||
|
# input for php logs
|
||||||
|
port => 12201
|
||||||
|
add_field => [ 'source', "php" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
filter {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
output {
|
||||||
|
stdout { }
|
||||||
|
}
|
10
docker/nginx/Dockerfile
Normal file
10
docker/nginx/Dockerfile
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
FROM nginx
|
||||||
|
|
||||||
|
COPY ./public /var/www/app/public
|
||||||
|
|
||||||
|
# gz encode builded files
|
||||||
|
|
||||||
|
RUN gzip -9 -k -f -r /var/www/app/public/build/*
|
||||||
|
|
||||||
|
COPY ./docker/nginx/default.conf /etc/nginx/conf.d/default.conf
|
||||||
|
|
71
docker/nginx/default.conf
Normal file
71
docker/nginx/default.conf
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
upstream phpfcgi {
|
||||||
|
server php:9000;
|
||||||
|
# server unix:/var/run/php5-fpm.sock; #for PHP-FPM running on UNIX socket
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
|
||||||
|
# only for getting traffic from collabora, when opening nginx:8001
|
||||||
|
listen 8001;
|
||||||
|
|
||||||
|
#server_name symfony4;
|
||||||
|
root /var/www/app/public;
|
||||||
|
|
||||||
|
error_log /dev/stderr;
|
||||||
|
access_log /dev/stdout main;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
index index.php;
|
||||||
|
try_files $uri /index.php$is_args$args;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /build/ {
|
||||||
|
expires 30d;
|
||||||
|
add_header Pragma public;
|
||||||
|
add_header Cache-Control "public";
|
||||||
|
|
||||||
|
gzip_static on;
|
||||||
|
gzip_types
|
||||||
|
application/atom+xml
|
||||||
|
application/geo+json
|
||||||
|
application/javascript
|
||||||
|
application/x-javascript
|
||||||
|
application/json
|
||||||
|
application/ld+json
|
||||||
|
application/manifest+json
|
||||||
|
application/rdf+xml
|
||||||
|
application/rss+xml
|
||||||
|
application/xhtml+xml
|
||||||
|
application/xml
|
||||||
|
font/eot
|
||||||
|
font/otf
|
||||||
|
font/ttf
|
||||||
|
image/svg+xml
|
||||||
|
text/css
|
||||||
|
text/javascript
|
||||||
|
text/plain
|
||||||
|
text/xml;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ ^/index\.php(/|$) {
|
||||||
|
fastcgi_pass phpfcgi;
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
||||||
|
include fastcgi_params;
|
||||||
|
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_param DOCUMENT_ROOT $document_root;
|
||||||
|
fastcgi_param HTTPS off;
|
||||||
|
|
||||||
|
fastcgi_buffers 16 16k;
|
||||||
|
fastcgi_buffer_size 32k;
|
||||||
|
proxy_buffer_size 16k;
|
||||||
|
proxy_busy_buffers_size 16k;
|
||||||
|
|
||||||
|
http2_push_preload on;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
}
|
82
docker/nginx/nginx.with-collabora.conf
Normal file
82
docker/nginx/nginx.with-collabora.conf
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
user nginx;
|
||||||
|
worker_processes 1;
|
||||||
|
|
||||||
|
error_log /var/log/nginx/error.log warn;
|
||||||
|
pid /var/run/nginx.pid;
|
||||||
|
|
||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
http {
|
||||||
|
include /etc/nginx/mime.types;
|
||||||
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
|
|
||||||
|
access_log /dev/stdout main;
|
||||||
|
error_log /dev/stderr;
|
||||||
|
|
||||||
|
sendfile on;
|
||||||
|
#tcp_nopush on;
|
||||||
|
|
||||||
|
keepalive_timeout 65;
|
||||||
|
|
||||||
|
gzip off;
|
||||||
|
|
||||||
|
#include /etc/nginx/conf.d/*.conf;
|
||||||
|
|
||||||
|
# permet l'upload de fichiers
|
||||||
|
client_max_body_size 3M;
|
||||||
|
|
||||||
|
upstream phpfcgi {
|
||||||
|
server php:9000;
|
||||||
|
# server unix:/var/run/php5-fpm.sock; #for PHP-FPM running on UNIX socket
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen 8001;
|
||||||
|
|
||||||
|
#server_name symfony4;
|
||||||
|
root /var/www/app/public;
|
||||||
|
|
||||||
|
error_log /dev/stderr;
|
||||||
|
access_log /dev/stdout main;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
index index.php;
|
||||||
|
try_files $uri /index.php$is_args$args;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /build/ {
|
||||||
|
expires 30d;
|
||||||
|
add_header Pragma public;
|
||||||
|
add_header Cache-Control "public";
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ ^/index\.php(/|$) {
|
||||||
|
fastcgi_pass phpfcgi;
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
||||||
|
include fastcgi_params;
|
||||||
|
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_param DOCUMENT_ROOT $document_root;
|
||||||
|
fastcgi_param HTTPS off;
|
||||||
|
|
||||||
|
fastcgi_buffers 16 16k;
|
||||||
|
fastcgi_buffer_size 32k;
|
||||||
|
proxy_buffer_size 16k;
|
||||||
|
proxy_busy_buffers_size 16k;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
56
entrypoint.sh
Executable file
56
entrypoint.sh
Executable file
@ -0,0 +1,56 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
#immediatly exit if a command fails:
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# waiting for the database to be ready
|
||||||
|
if [ -z "${DATABASE_HOST}" ]; then
|
||||||
|
while ! timeout 1 bash -c "cat < /dev/null > /dev/tcp/${DATABASE_HOST}/${DATABASE_PORT}"
|
||||||
|
do
|
||||||
|
echo "$(date) : waiting one second for database";
|
||||||
|
sleep 1;
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "$(date) : the database is ready";
|
||||||
|
else
|
||||||
|
echo "we assume the database is ready";
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [ $(id -u) = "0" ]; then
|
||||||
|
{ \
|
||||||
|
echo "[www]"; \
|
||||||
|
echo ""; \
|
||||||
|
echo "user=${PHP_FPM_USER}"; \
|
||||||
|
echo "group=${PHP_FPM_GROUP}"; \
|
||||||
|
} > /usr/local/etc/php-fpm.d/zz-user.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ \
|
||||||
|
echo ""; \
|
||||||
|
echo "session.save_handler = redis" ; \
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_PORT}?db=10\"" ; \
|
||||||
|
echo "session.gc_maxlifetime = ${SESSION_LIFETIME}" ; \
|
||||||
|
} >> /usr/local/etc/php/conf.d/custom.ini
|
||||||
|
|
||||||
|
if [ "${APP_ENV}" = "prod" ]; then
|
||||||
|
composer dump-env "${APP_ENV}"
|
||||||
|
chmod +r /var/www/app/.env.local.php
|
||||||
|
|
||||||
|
if [ "${PREVENT_MIGRATIONS}" != "true" ]; then
|
||||||
|
php /var/www/app/bin/console doctrine:migrations:status
|
||||||
|
php /var/www/app/bin/console doctrine:migrations:migrate -n
|
||||||
|
php /var/www/app/bin/console messenger:setup-transports
|
||||||
|
php /var/www/app/bin/console chill:db:sync-views
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${CLEAR_CACHE}" != "false" ]; then
|
||||||
|
#prepare cache
|
||||||
|
php /var/www/app/bin/console cache:clear --no-warmup
|
||||||
|
chgrp ${PHP_FPM_GROUP} /var/www/app/var/cache -R && chmod g+rw /var/www/app/var/cache -R
|
||||||
|
chgrp ${PHP_FPM_GROUP} /var/www/app/var/log -R && chmod g+rw /var/www/app/var/log -R
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec "${@}"
|
||||||
|
|
22
symfony.lock
22
symfony.lock
@ -35,6 +35,28 @@
|
|||||||
"post-install-chill.sh"
|
"post-install-chill.sh"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"chill-project/chill-deploy": {
|
||||||
|
"version": "1.0",
|
||||||
|
"recipe": {
|
||||||
|
"repo": "gitlab.com/Chill-Projet/chill-recipes",
|
||||||
|
"branch": "main",
|
||||||
|
"version": "1.0",
|
||||||
|
"ref": "2d916e260041fca4852a8887ff113667c6297046"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
".gitea/workflows/release/update-composer-lock.yaml",
|
||||||
|
"docker/db/docker-entrypoint-initdb.d/0000-add-extensions.sql",
|
||||||
|
"docker/logstash/Dockerfile",
|
||||||
|
"docker/logstash/pipeline/logstash.conf",
|
||||||
|
"docker/nginx/Dockerfile",
|
||||||
|
"docker/nginx/default.conf",
|
||||||
|
"docker/nginx/nginx.with-collabora.conf",
|
||||||
|
"Dockerfile",
|
||||||
|
".dockerignore",
|
||||||
|
"entrypoint.sh",
|
||||||
|
".drone.yml"
|
||||||
|
]
|
||||||
|
},
|
||||||
"doctrine/annotations": {
|
"doctrine/annotations": {
|
||||||
"version": "1.14",
|
"version": "1.14",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user