Compare commits

...
Author SHA1 Message Date
renovate-bot 76d0ae827d Update dependency intl-messageformat to v12 2026-10-22 02:03:31 +00: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
julielenaerts d538bf0410 Update php version in Dockerfile
build-images / build-and-push (push) Successful in 11m52s
2026-09-17 17:08:38 +02:00
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
11 changed files with 91 additions and 167 deletions

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
## 2.13.2 - 2026-09-17
### DX
* Fix permissions for writing to cache directory during helm deployment
+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
@@ -0,0 +1,7 @@
kind: Release
body: |
- intl-messageformat: ^10.5.11 -> ^12.0.0
time: 2026-10-22T02:03:31+00:00
custom:
Issue: ""
-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:24
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 }}
+18
View File
@@ -6,9 +6,27 @@ 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.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
## 2.13.1 - 2026-09-17 ## 2.13.1 - 2026-09-17
### Fixed ### Fixed
* Dockerfile: create cache directory for helm deployment * Dockerfile: create cache directory for helm deployment
### DX
* Build image with gitea actions
## 2.13.0 - 2026-07-10 ## 2.13.0 - 2026-07-10
### Release ### Release
+2 -79
View File
@@ -1,79 +1,4 @@
FROM php:8.3-fpm-alpine AS chill_base_php82 FROM chill/base-image:8.4-edge
ENV POSTGRES_VERSION=16
# 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 directories
@@ -96,8 +21,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
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
ENV PHP_FPM_USER=www-data \ ENV PHP_FPM_USER=www-data \
@@ -105,4 +28,4 @@ ENV PHP_FPM_USER=www-data \
COMPOSER_HOME=/var/www/app/.composer \ COMPOSER_HOME=/var/www/app/.composer \
SESSION_LIFETIME=10800 SESSION_LIFETIME=10800
CMD [ "php-fpm" ] CMD [ "php-fpm" ]
+1 -1
View File
@@ -6,7 +6,7 @@
"devDependencies": { "devDependencies": {
"@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets", "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
"bootstrap": "5.2.3", "bootstrap": "5.2.3",
"intl-messageformat": "^10.5.11" "intl-messageformat": "^12.0.0"
}, },
"scripts": { "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", "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"]
}