Update dependency doctrine/doctrine-fixtures-bundle to v4

.changes/2.13.5.md

@@ -1,3 +0,0 @@
-## 2.13.5 - 2026-10-21
-### Security
-* Update with patch for php vulnerability

.changes/2.13.6.md

@@ -1,3 +0,0 @@
-## 2.13.6 - 2026-10-26
-### DX
-* Run container as www-data user instead of root

.changes/unreleased/Release-renovate-1791601343270.yaml

@@ -0,0 +1,7 @@
+kind: Release
+body: |
+  - doctrine/doctrine-fixtures-bundle: ^3.3 ->  ^4.0
+
+time: 2026-10-10T03:02:23+00:00
+custom:
+  Issue: ""

.changes/unreleased/Release-renovate-1793066589505.yaml

@@ -1,15 +0,0 @@
-kind: Release
-body: |
-  - axllent/mailpit:  ->  
-  - chill/base-image: 8.4-edge ->  8.4-edge
-  - chill/base-image: 8.4-edge ->  8.4-edge
-  - docker.elastic.co/logstash/logstash-oss: 8.1.0-amd64 ->  8.1.0-amd64
-  - gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image: latest ->  latest
-  - intl-messageformat: ^10.5.11 ->  10.7.18
-  - nginx:  ->  
-  - redis:  ->  
-  - registry.gitlab.com/champs-libres/public/relatorio-tornado/app: latest ->  latest
-
-time: 2026-10-27T02:03:09+00:00
-custom:
-  Issue: ""

.gitea/workflows/release/build-image.yaml

@@ -19,7 +19,7 @@ jobs:
           password: ${{ secrets.OVH_REGISTRY_PASSWORD }}
 
       - name: Install Dependencies and Build Assets
-        uses: docker://chill/base-image:8.4-edge@sha256:1476057182ee4f77a52156f20834224a6268be44e5886e8b172b624a40ed9a5f
+        uses: docker://chill/base-image:8.4-edge
         env:
           APP_ENV: prod
         with:

.gitea/workflows/release/update-composer-lock.yaml

@@ -19,7 +19,7 @@ jobs:
               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@sha256:d728a939475e465c488056ec8b9c12f31601ea27251aad830499577857b7be94
+              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

.gitignore

@@ -1,4 +1,4 @@
-docker/
+
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php

CHANGELOG.md

@@ -6,14 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## 2.13.6 - 2026-10-26
-### DX
-* Run container as www-data user instead of root
-
-## 2.13.5 - 2026-10-21
-### Security
-* Update with patch for php vulnerability
-
 ## 2.13.4 - 2026-09-17
 ### DX
 * Fix Dockerfile permissions to be able to write to the whole /var/www/app/ directory 

Dockerfile

@@ -1,38 +1,112 @@
-FROM chill/base-image:8.4-edge@sha256:1476057182ee4f77a52156f20834224a6268be44e5886e8b172b624a40ed9a5f
+FROM php:8.4-fpm-alpine AS chill_base_php82
 
-# copy directories with ownership for the unprivileged runtime user
+ENV POSTGRES_VERSION=16
-COPY --chown=www-data:www-data ./bin    /var/www/app/bin/.
-COPY --chown=www-data:www-data ./composer.* /var/www/app/
-COPY --chown=www-data:www-data ./config    /var/www/app/config/.
-COPY --chown=www-data:www-data ./migrations /var/www/app/migrations/.
-COPY --chown=www-data:www-data ./public    /var/www/app/public/.
-COPY --chown=www-data:www-data ./src    /var/www/app/src/.
-COPY --chown=www-data:www-data ./templates /var/www/app/templates/.
-COPY --chown=www-data:www-data ./translations /var/www/app/translations/.
-COPY --chown=www-data:www-data ./vendor /var/www/app/vendor/.
 
-COPY --chown=www-data:www-data ./.env /var/www/app/.env
+# default UID for the PHP user
+ARG UID=1000
+ARG GID=1000
+
+# 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 \
+    wget gnupg \
+    libpq-dev \
+    icu-dev icu-libs icu-data-full \
+    oniguruma-dev \
+    libzip libzip-dev \
+    linux-headers \
+    gcc g++ make autoconf \
+    bash git \
+    rabbitmq-c rabbitmq-c-dev \
+    && 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 \
+    && pecl install amqp \
+    && docker-php-ext-enable amqp \
+    && 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 --chown=www-data:www-data ./public/build/manifest.json /var/www/app/public/build/manifest.json
+COPY ./public/build/manifest.json /var/www/app/public/build/manifest.json
 
-COPY ./entrypoint.sh /entrypoint.sh
+ADD ./entrypoint.sh /.
 
-# - mark entrypoint executable
+RUN chmod +x /entrypoint.sh
-# - declare the FPM pool user/group at build time (was previously written by entrypoint.sh as root)
-# - prepare writable Symfony var/ and COMPOSER_HOME directories for the unprivileged runtime user
-RUN chmod +x /entrypoint.sh \
-    && printf '[www]\nuser=www-data\ngroup=www-data\n' > /usr/local/etc/php-fpm.d/zz-user.conf \
-    && mkdir -p /var/www/app/var/cache /var/www/app/var/log /var/www/app/.composer \
-    && chown -R www-data:www-data /var/www/app/var /var/www/app/.composer \
-    && chown www-data:www-data /var/www/app
-# php-fpm listens on 9000 by default (unprivileged port)
-EXPOSE 9000
 
-USER www-data
+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"]
 
-ENV COMPOSER_HOME=/var/www/app/.composer
+ENV PHP_FPM_USER=www-data \
+    PHP_FPM_GROUP=www-data \
+    COMPOSER_HOME=/var/www/app/.composer \
+    SESSION_LIFETIME=10800
 
 CMD [ "php-fpm" ]

compose.override.yaml

@@ -3,7 +3,7 @@ version: '3'
 services:
 ###> symfony/mailer ###
   mailer:
-    image: axllent/mailpit@sha256:0790692be935ea4420d085694f7985b1f692ca6a8771ab0e0bd8ba75ac180498
+    image: axllent/mailpit
     ports:
       - "1025"
       - "8025"

compose.yaml

@@ -17,9 +17,9 @@ services:
 
 ###> chill-project/chill-bundles ###
   redis:
-      image: redis@sha256:0a014ae5c04f55c82aaad2314de411c7a203de1c4312c3e526939226a0185dd9
+      image: redis
   relatorio:
-      image: registry.gitlab.com/champs-libres/public/relatorio-tornado/app:latest@sha256:2c4aa2f422c389d940adfd760b0856d237023d66cded0aa026b532b29192212e
+      image: registry.gitlab.com/champs-libres/public/relatorio-tornado/app:latest
 ###< chill-project/chill-bundles ###
 
 volumes:

composer.json

@@ -32,7 +32,7 @@
     "nelmio/alice": "^3.8",
     "phpunit/phpunit": ">=7.5",
     "symfony/maker-bundle": "^1.20",
-    "doctrine/doctrine-fixtures-bundle": "^3.3",
+    "doctrine/doctrine-fixtures-bundle": "^4.0",
     "symfony/web-profiler-bundle": "^5.0",
     "symfony/var-dumper": "4.*",
     "symfony/phpunit-bridge": "^5.2",

docker/logstash/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/logstash/logstash-oss:8.1.0-amd64@sha256:f48c2f7db8b63572fa36db259c98c3894d89fb28d37f9546c26acfc0de525338
+FROM docker.elastic.co/logstash/logstash-oss:8.1.0-amd64
 
 RUN \
   bin/logstash-plugin install logstash-output-gelf \

docker/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx@sha256:4c41e2d0a3a55b325ed572cd0200bdb72af1433c3daa2bca6ef8eea68ce504a2
+FROM nginx
 
 COPY ./public /var/www/app/public
 

entrypoint.sh

@@ -16,6 +16,23 @@ 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
@@ -31,6 +48,8 @@ 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 "${@}"

package.json

@@ -6,7 +6,7 @@
   "devDependencies": {
     "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "bootstrap": "5.2.3",
-    "intl-messageformat": "10.7.18"
+    "intl-messageformat": "^10.5.11"
   },
   "scripts": {
     "specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",

renovate.json

@@ -1,4 +1,3 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-  "reviewers": ["LenaertsJ"]
 }