Compare commits

...
Author SHA1 Message Date
julielenaerts f423b6461f Update to v2.13.2
build-images / build-and-push (push) Successful in 11m58s
2026-09-17 16:43:12 +02:00
julielenaerts b6dfd83e82 DX: fix permission issues for the cache directory within Dockerfile
Delete drone.yml file
2026-09-17 16:41:40 +02:00
julielenaerts 8cbf1764f9 Merge branch 'main' of gitea.champs-libres.be:Chill-project/chill-base-app-v3
continuous-integration/drone/tag Build was killed
build-images / build-and-push (push) Successful in 10m18s
2026-09-17 16:16:02 +02:00
julielenaerts 9977d76669 DX: build-image.yaml with gitea actions 2026-09-17 16:15:50 +02:00
LenaertsJ 79b3b0fa18 Update .changes/v2.13.1 2026-09-17 14:14:38 +00:00
julielenaerts 6d5de21bef Upgrade to v2.13.1 2026-09-17 16:11:58 +02:00
julielenaerts 3bea6183af fix: ensure cache directory exists in the image 2026-09-17 16:10:55 +02:00
julielenaerts a2738a2f7c Update drone file to use node 24
continuous-integration/drone/tag Build is passing
2026-07-10 13:59:05 +02:00
julielenaerts e29c743985 remove composer and yarn lock files
continuous-integration/drone/tag Build is failing
2026-07-10 13:51:59 +02:00
julielenaerts 46ae716aa0 Update dockerfile to use postgresql 16
continuous-integration/drone/tag Build is failing
2026-07-10 13:27:32 +02:00
julielenaerts 9a401d740a Update chill base to v2.13.0 with bundles v5.1.3
continuous-integration/drone/tag Build is failing
2026-07-10 12:09:07 +02:00
julielenaerts 136dba5257 Add security config user-checker and change config webpack.config.js 2026-07-10 12:07:24 +02:00
julielenaerts 8815d735e0 Add TicketBundle 2026-07-10 12:06:51 +02:00
14 changed files with 101 additions and 22685 deletions
+3
View File
@@ -0,0 +1,3 @@
## 2.13.0 - 2026-07-10
### Release
* Release chill with bundles version 5.1.3
+5
View File
@@ -0,0 +1,5 @@
## 2.13.1 - 2026-09-17
### Fixed
* Dockerfile: create cache directory for helm deployment
### DX
* Build image with gitea actions
+3
View File
@@ -0,0 +1,3 @@
## 2.13.2 - 2026-09-17
### DX
* Fix permissions for writing to cache directory during helm deployment
-87
View File
@@ -1,87 +0,0 @@
---
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
@@ -0,0 +1,47 @@
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 }}
+14
View File
@@ -6,6 +6,20 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
## 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
### Release
* Update chill bundles to v4.7.0
+7 -1
View File
@@ -1,6 +1,6 @@
FROM php:8.3-fpm-alpine AS chill_base_php82
ENV POSTGRES_VERSION=15
ENV POSTGRES_VERSION=16
# default UID for the PHP user
ARG UID=1000
@@ -96,6 +96,12 @@ ADD ./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/var && \
chmod -R 755 /var/www/app/var && \
chown -R 82:82 /usr/local/etc/php/conf.d && \
chmod -R 755 /usr/local/etc/php/conf.d
ENTRYPOINT ["/entrypoint.sh"]
ENV PHP_FPM_USER=www-data \
+1 -1
View File
@@ -15,7 +15,7 @@
},
"require": {
"ext-redis": "*",
"chill-project/chill-bundles": "v4.7.0",
"chill-project/chill-bundles": "v5.1.3",
"hslavich/oneloginsaml-bundle": "^2.10",
"symfony/runtime": "^5.4.0",
"symfony/console": "5.4.*",
Generated
-15730
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -30,6 +30,7 @@ return [
Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
Chill\EventBundle\ChillEventBundle::class => ['all' => true],
Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
@@ -13,6 +13,7 @@ doctrine_migrations:
'Chill\Migrations\AsideActivity': '@ChillAsideActivityBundle/migrations'
'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
all_or_nothing:
true
+1
View File
@@ -49,6 +49,7 @@ security:
path: /logout
switch_user: true
# 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
# Note: Only the *first* access control that matches will be used
+18 -11
View File
@@ -94,19 +94,26 @@ module.exports = (async () => {
Encore
.setOutputPath('public/build/')
.setPublicPath('/build')
.enableSassLoader()
.enableSassLoader(function (options) {
// 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(() => {}, {
version: 3,
runtimeCompilerBuild: true,
})
.enableTypeScriptLoader(/*function (tsConfig){
tsConfig.appendTsSuffixTo = [/\.vue$/];
tsConfig.appendTsxSuffixTo = [/\.vue$/];
// 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.paths = {"translator": [resolve(__dirname, "./assets/translator.ts")]};
tsConfig.silent = false;
}*/)
.enableTypeScriptLoader(function (tsConfig){
tsConfig.appendTsSuffixTo = [/\.vue$/];
tsConfig.appendTsxSuffixTo = [/\.vue$/];
// temporary fix for https://github.com/vuejs/vue-loader/issues/1915 and https://github.com/vuejs/core/issues/2855
tsConfig.compilerOptions = {strict: !Encore.isProduction()};
// disable type checking in ts-loader: Vue files are already checked by vue-tsc,
// and the generated code (e.g. mergeModels) may use APIs not yet in the bundled @vue/runtime-core types.
// see https://github.com/vuejs/core/issues/10331#issuecomment-1938909170
tsConfig.transpileOnly = true;
tsConfig.silent = false;
})
//.enableForkedTypeScriptTypesChecking()
.autoProvidejQuery()
.enableSourceMaps(!Encore.isProduction())
@@ -129,7 +136,7 @@ module.exports = (async () => {
;
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
-6855
View File
File diff suppressed because it is too large Load Diff