Compare commits

..
Author SHA1 Message Date
julielenaerts fd924da17a Add configuration for exposing VersionProvider 2026-01-05 15:08:29 +01:00
20 changed files with 22702 additions and 116 deletions
-3
View File
@@ -1,3 +0,0 @@
## 2.13.0 - 2026-07-10
### Release
* Release chill with bundles version 5.1.3
-5
View File
@@ -1,5 +0,0 @@
## 2.13.1 - 2026-09-17
### Fixed
* Dockerfile: create cache directory for helm deployment
### DX
* Build image with gitea actions
-3
View File
@@ -1,3 +0,0 @@
## 2.13.2 - 2026-09-17
### DX
* Fix permissions for writing to cache directory during helm deployment
-3
View File
@@ -1,3 +0,0 @@
## 2.13.3 - 2026-09-17
### DX
* Upgrade to php version 8.4 in Dockerfile
-3
View File
@@ -1,3 +0,0 @@
## 2.13.4 - 2026-09-17
### DX
* Fix Dockerfile permissions to be able to write to the whole /var/www/app/ directory
@@ -0,0 +1,5 @@
kind: Feature
body: Display version of chill bundles in application footer
time: 2026-01-05T15:07:41.09639691+01:00
custom:
Issue: ""
+87
View File
@@ -0,0 +1,87 @@
---
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
- bin/console cache:clear
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
...
-47
View File
@@ -1,47 +0,0 @@
name: build-images
on:
push:
tags:
- 'v*'
jobs:
build-and-push:
runs-on: cth-ubuntu-latest
steps:
- name: Checkout
uses: https://github.com/actions/checkout@v4
- name: Log in to Docker Registry
uses: https://github.com/docker/login-action@v3
with:
registry: h3m6q87t.gra7.container-registry.ovh.net
username: ${{ vars.OVH_REGISTRY_USERNAME }}
password: ${{ secrets.OVH_REGISTRY_PASSWORD }}
- name: Install Dependencies and Build Assets
uses: docker://chill/base-image:8.4-edge
env:
APP_ENV: prod
with:
entrypoint: /bin/sh
# We install node/yarn inside the PHP container to ensure translations are available
args: -c "apk add --no-cache nodejs yarn && composer install --no-scripts --no-interaction && bin/console cache:clear && yarn install && yarn run encore production"
- name: Set up Docker Buildx
uses: https://github.com/docker/setup-buildx-action@v3
- name: Build and Push PHP Image
uses: https://github.com/docker/build-push-action@v5
with:
context: .
file: Dockerfile
push: true
tags: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php:${{ github.ref_name }}
- name: Build and Push Nginx Image
uses: https://github.com/docker/build-push-action@v5
with:
context: .
file: docker/nginx/Dockerfile
push: true
tags: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/nginx:${{ github.ref_name }}
+3
View File
@@ -33,3 +33,6 @@ phpstan.neon
.phpunit.result.cache .phpunit.result.cache
/phpunit.xml /phpunit.xml
###< symfony/phpunit-bridge ### ###< symfony/phpunit-bridge ###
.idea/*
/bin/*
-22
View File
@@ -6,28 +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.13.4 - 2026-09-17
### DX
* Fix Dockerfile permissions to be able to write to the whole /var/www/app/ directory
## 2.13.3 - 2026-09-17
### DX
* Upgrade to php version 8.4 in Dockerfile
## 2.13.2 - 2026-09-17
### DX
* Fix permissions for writing to cache directory during helm deployment
## 2.13.1 - 2026-09-17
### Fixed
* Dockerfile: create cache directory for helm deployment
### DX
* Build image with gitea actions
## 2.13.0 - 2026-07-10
### Release
* Release chill with bundles version 5.1.3
## 2.12.0 - 2025-11-10 ## 2.12.0 - 2025-11-10
### Release ### Release
* Update chill bundles to v4.7.0 * Update chill bundles to v4.7.0
+2 -8
View File
@@ -1,6 +1,6 @@
FROM php:8.4-fpm-alpine AS chill_base_php82 FROM php:8.3-fpm-alpine AS chill_base_php82
ENV POSTGRES_VERSION=16 ENV POSTGRES_VERSION=15
# default UID for the PHP user # default UID for the PHP user
ARG UID=1000 ARG UID=1000
@@ -96,12 +96,6 @@ ADD ./entrypoint.sh /.
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh
RUN mkdir -p /var/www/app/var/cache /var/www/app/var/log && \
chown -R 82:82 /var/www/app && \
chmod -R 755 /var/www/app && \
chown -R 82:82 /usr/local/etc/php/conf.d && \
chmod -R 755 /usr/local/etc/php/conf.d
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
ENV PHP_FPM_USER=www-data \ ENV PHP_FPM_USER=www-data \
+1 -1
View File
@@ -15,7 +15,7 @@
}, },
"require": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "v5.1.3", "chill-project/chill-bundles": "v4.7.0",
"hslavich/oneloginsaml-bundle": "^2.10", "hslavich/oneloginsaml-bundle": "^2.10",
"symfony/runtime": "^5.4.0", "symfony/runtime": "^5.4.0",
"symfony/console": "5.4.*", "symfony/console": "5.4.*",
Generated
+15730
View File
File diff suppressed because it is too large Load Diff
-1
View File
@@ -30,7 +30,6 @@ return [
Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true], Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
Chill\WopiBundle\ChillWopiBundle::class => ['all' => true], Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
Chill\EventBundle\ChillEventBundle::class => ['all' => true], Chill\EventBundle\ChillEventBundle::class => ['all' => true],
Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true], Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
@@ -13,7 +13,6 @@ doctrine_migrations:
'Chill\Migrations\AsideActivity': '@ChillAsideActivityBundle/migrations' 'Chill\Migrations\AsideActivity': '@ChillAsideActivityBundle/migrations'
'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations' 'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations' 'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
all_or_nothing: all_or_nothing:
true true
-1
View File
@@ -49,7 +49,6 @@ security:
path: /logout path: /logout
switch_user: true switch_user: true
# end of lines added by chill-bundles recipe # end of lines added by chill-bundles recipe
user_checker: chill_security.user_checker
# Easy way to control access for large sections of your site # Easy way to control access for large sections of your site
# Note: Only the *first* access control that matches will be used # Note: Only the *first* access control that matches will be used
+3
View File
@@ -9,6 +9,9 @@ twig:
# and adapt it lightly. # and adapt it lightly.
# #
form_themes: ['@ChillMain/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig'] form_themes: ['@ChillMain/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig']
globals:
# Expose the VersionProvider service to Twig as a global to have access to chill bundles version
chillBundlesVersion: '@Chill\MainBundle\Service\VersionProvider'
when@dev: when@dev:
twig: twig:
+5
View File
@@ -22,3 +22,8 @@ services:
# add more service definitions when explicit configuration is needed # add more service definitions when explicit configuration is needed
# please note that last definitions always *replace* previous ones # please note that last definitions always *replace* previous ones
# provide version of installed chill bundles for display in interface
Chill\MainBundle\Service\VersionProvider:
arguments:
$packageName: 'chill-project/chill-bundles'
+11 -18
View File
@@ -94,26 +94,19 @@ module.exports = (async () => {
Encore Encore
.setOutputPath('public/build/') .setOutputPath('public/build/')
.setPublicPath('/build') .setPublicPath('/build')
.enableSassLoader(function (options) { .enableSassLoader()
// If set to true, Sass wont print warnings that are caused by dependencies (like bootstrap):
// https://sass-lang.com/documentation/js-api/interfaces/options/#quietDeps
options.sassOptions.quietDeps = true;
options.sassOptions.silenceDeprecations = ['import'];
})
.enableVueLoader(() => {}, { .enableVueLoader(() => {}, {
version: 3, version: 3,
runtimeCompilerBuild: true,
}) })
.enableTypeScriptLoader(function (tsConfig){ .enableTypeScriptLoader(/*function (tsConfig){
tsConfig.appendTsSuffixTo = [/\.vue$/]; tsConfig.appendTsSuffixTo = [/\.vue$/];
tsConfig.appendTsxSuffixTo = [/\.vue$/]; tsConfig.appendTsxSuffixTo = [/\.vue$/];
// temporary fix for https://github.com/vuejs/vue-loader/issues/1915 and https://github.com/vuejs/core/issues/2855 // temporary fix for https://github.com/vuejs/vue-loader/issues/1915 and https://github.com/vuejs/core/issues/2855
tsConfig.compilerOptions = {strict: !Encore.isProduction()}; tsConfig.compilerOptions = {strict: !Encore.isProduction()};
// disable type checking in ts-loader: Vue files are already checked by vue-tsc, tsConfig.compilerOptions.paths = {"translator": [resolve(__dirname, "./assets/translator.ts")]};
// and the generated code (e.g. mergeModels) may use APIs not yet in the bundled @vue/runtime-core types. tsConfig.silent = false;
// see https://github.com/vuejs/core/issues/10331#issuecomment-1938909170 }*/)
tsConfig.transpileOnly = true;
tsConfig.silent = false;
})
//.enableForkedTypeScriptTypesChecking() //.enableForkedTypeScriptTypesChecking()
.autoProvidejQuery() .autoProvidejQuery()
.enableSourceMaps(!Encore.isProduction()) .enableSourceMaps(!Encore.isProduction())
@@ -136,7 +129,7 @@ module.exports = (async () => {
; ;
Encore.addAliases({ Encore.addAliases({
translator: resolve(__dirname, './vendor/chill-project/chill-bundles/assets/translator'), translator: resolve(__dirname, './vendor/chill-project/chill-bundles/assets/translator')
}); });
// populate config with chill entries // populate config with chill entries
+6855
View File
File diff suppressed because it is too large Load Diff