Compare commits

..
Author SHA1 Message Date
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
6 changed files with 11 additions and 91 deletions

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
## 2.13.5 - 2026-10-21
### Security
* Update with patch for php vulnerability
@@ -1,7 +0,0 @@
kind: Release
body: |
- docker.elastic.co/logstash/logstash-oss: 8.1.0-amd64 -> 8.19.23-amd64
time: 2026-10-10T02:03:07+00:00
custom:
Issue: ""
+4
View File
@@ -6,6 +6,10 @@ 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 ## 2.13.4 - 2026-09-17
### DX ### DX
* Fix Dockerfile permissions to be able to write to the whole /var/www/app/ directory * Fix Dockerfile permissions to be able to write to the whole /var/www/app/ directory
+1 -82
View File
@@ -1,79 +1,4 @@
FROM php:8.4-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,12 +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 && \
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
@@ -1,4 +1,4 @@
FROM docker.elastic.co/logstash/logstash-oss:8.19.23-amd64@sha256:ff75c74eb5c11e570a5038f8dfbb1561c4ba0d5fe78ac3744a0d41206014fbe4 FROM docker.elastic.co/logstash/logstash-oss:8.1.0-amd64
RUN \ RUN \
bin/logstash-plugin install logstash-output-gelf \ bin/logstash-plugin install logstash-output-gelf \
+2 -1
View File
@@ -1,3 +1,4 @@
{ {
"$schema": "https://docs.renovatebot.com/renovate-schema.json" "$schema": "https://docs.renovatebot.com/renovate-schema.json",
"reviewers": ["LenaertsJ"]
} }