Compare commits

..
11 Commits
Author SHA1 Message Date
renovate-bot a828bfde9d Pin dependencies 2026-11-03 02:05:19 +00:00
julielenaerts f1878e72e0 Update to v2.13.6
build-images / build-and-push (push) Successful in 3m39s
2026-10-26 11:03:58 +01:00
julielenaerts 0e6ec94ae4 Run container as unprivileged www-data user and simplify entrypoint
- Remove root-only FPM user configuration from entrypoint.sh (moved to Dockerfile build time)
- Remove Redis session configuration from entrypoint.sh (handled by Symfony services)
- Remove cache directory permission adjustments (unnecessary with proper ownership)
- Set file ownership to www-data:www-data at build time using COPY --chown
- Create required directories and set ownership in single RUN layer
- Switch to www-data USER before CMD
- Remove PHP_FPM_USER, PHP_FPM_GROUP, SESSION_LIFETIME environment variables
- Add docker/ directory to .dockerignore
2026-10-26 11:02:05 +01:00
julielenaerts b1eb46f902 Update to v2.13.5
build-images / build-and-push (push) Successful in 4m32s
2026-10-21 20:37:32 +02:00
julielenaerts 154d953ec5 Merge branch 'main' of gitea.champs-libres.be:Chill-project/chill-base-app-v3
build-images / build-and-push (push) Successful in 3m51s
2026-10-21 17:19:20 +02:00
julielenaerts 36481c3296 Use simplified version of Dockerfile 2026-10-21 17:13:07 +02:00
damercier 65d4dfbc46 Update renovate.json 2026-10-19 08:29:07 +00:00
damercier 1b8bbe6b29 Merge pull request 'Configure Renovate' (#2) from renovate/configure into main
Reviewed-on: #2
2026-10-06 18:57:44 +00:00
renovate-bot ef0e2276ed Add renovate.json 2026-10-06 02:01:47 +00:00
julielenaerts aecf9fe674 Update to v2.13.4
build-images / build-and-push (push) Successful in 26m45s
2026-09-17 18:02:31 +02:00
julielenaerts d5a36d9ffe Update to v2.13.3
build-images / build-and-push (push) Successful in 8m14s
2026-09-17 17:20:35 +02:00
17 changed files with 83 additions and 129 deletions

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
## 2.13.3 - 2026-09-17
### DX
* Upgrade to php version 8.4 in Dockerfile
+3
View File
@@ -0,0 +1,3 @@
## 2.13.4 - 2026-09-17
### DX
* Fix Dockerfile permissions to be able to write to the whole /var/www/app/ directory
+3
View File
@@ -0,0 +1,3 @@
## 2.13.5 - 2026-10-21
### Security
* Update with patch for php vulnerability
+3
View File
@@ -0,0 +1,3 @@
## 2.13.6 - 2026-10-26
### DX
* Run container as www-data user instead of root
@@ -0,0 +1,15 @@
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-11-03T02:05:19+00:00
custom:
Issue: ""
+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
password: ${{ secrets.OVH_REGISTRY_PASSWORD }}
- name: Install Dependencies and Build Assets
uses: docker://chill/base-image:8.4-edge
uses: docker://chill/base-image:8.4-edge@sha256:61eb6a5272187ef6f50c82a876278bfda12e838ea085dd63f84c34815c0ef1c5
env:
APP_ENV: prod
with:
@@ -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
uses: docker://gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest@sha256:d728a939475e465c488056ec8b9c12f31601ea27251aad830499577857b7be94
with:
# this is where we set the command to execute
args: composer update --no-install
+1 -1
View File
@@ -1,4 +1,4 @@
docker/
###> symfony/framework-bundle ###
/.env.local
/.env.local.php
+16
View File
@@ -6,6 +6,22 @@ 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
## 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
+27 -101
View File
@@ -1,112 +1,38 @@
FROM php:8.4-fpm-alpine AS chill_base_php82
FROM chill/base-image:8.4-edge@sha256:61eb6a5272187ef6f50c82a876278bfda12e838ea085dd63f84c34815c0ef1c5
ENV POSTGRES_VERSION=16
# copy directories with ownership for the unprivileged runtime user
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/.
# 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
COPY --chown=www-data:www-data ./.env /var/www/app/.env
# import the manifest.json file
COPY ./public/build/manifest.json /var/www/app/public/build/manifest.json
COPY --chown=www-data:www-data ./public/build/manifest.json /var/www/app/public/build/manifest.json
ADD ./entrypoint.sh /.
COPY ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
# - mark entrypoint executable
# - 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
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
USER www-data
ENTRYPOINT ["/entrypoint.sh"]
ENV PHP_FPM_USER=www-data \
PHP_FPM_GROUP=www-data \
COMPOSER_HOME=/var/www/app/.composer \
SESSION_LIFETIME=10800
ENV COMPOSER_HOME=/var/www/app/.composer
CMD [ "php-fpm" ]
CMD [ "php-fpm" ]
+1 -1
View File
@@ -3,7 +3,7 @@ version: '3'
services:
###> symfony/mailer ###
mailer:
image: axllent/mailpit
image: axllent/mailpit@sha256:9b3a463be15354c0f0eba91697d80e3e0d8a5623ef0e627cacc836bc17fd5231
ports:
- "1025"
- "8025"
+2 -2
View File
@@ -17,9 +17,9 @@ services:
###> chill-project/chill-bundles ###
redis:
image: redis
image: redis@sha256:de1068af6f552240dfab67bcc9bfef99bfc60f776bb4580ef077ea4c8c97e848
relatorio:
image: registry.gitlab.com/champs-libres/public/relatorio-tornado/app:latest
image: registry.gitlab.com/champs-libres/public/relatorio-tornado/app:latest@sha256:2c4aa2f422c389d940adfd760b0856d237023d66cded0aa026b532b29192212e
###< chill-project/chill-bundles ###
volumes:
+1 -1
View File
@@ -1,4 +1,4 @@
FROM docker.elastic.co/logstash/logstash-oss:8.1.0-amd64
FROM docker.elastic.co/logstash/logstash-oss:8.1.0-amd64@sha256:f48c2f7db8b63572fa36db259c98c3894d89fb28d37f9546c26acfc0de525338
RUN \
bin/logstash-plugin install logstash-output-gelf \
+1 -1
View File
@@ -1,4 +1,4 @@
FROM nginx
FROM nginx@sha256:5ab5b0b01097420873a3f3330f44248e34a3c2a3e8d5ee30658aeae8cb7435da
COPY ./public /var/www/app/public
-19
View File
@@ -16,23 +16,6 @@ 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
@@ -48,8 +31,6 @@ 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 "${@}"
+1 -1
View File
@@ -6,7 +6,7 @@
"devDependencies": {
"@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
"bootstrap": "5.2.3",
"intl-messageformat": "^10.5.11"
"intl-messageformat": "10.7.18"
},
"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",
+4
View File
@@ -0,0 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"reviewers": ["LenaertsJ"]
}