Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76d0ae827d |
No files matched your search
@@ -1,3 +0,0 @@
|
||||
## 2.13.6 - 2026-10-26
|
||||
### DX
|
||||
* Run container as www-data user instead of root
|
||||
@@ -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: ""
|
||||
@@ -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-11-03T02:05:19+00:00
|
||||
custom:
|
||||
Issue: ""
|
||||
@@ -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:61eb6a5272187ef6f50c82a876278bfda12e838ea085dd63f84c34815c0ef1c5
|
||||
uses: docker://chill/base-image:8.4-edge
|
||||
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@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
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
docker/
|
||||
|
||||
###> symfony/framework-bundle ###
|
||||
/.env.local
|
||||
/.env.local.php
|
||||
|
||||
@@ -6,10 +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
|
||||
|
||||
+20
-27
@@ -1,38 +1,31 @@
|
||||
FROM chill/base-image:8.4-edge@sha256:61eb6a5272187ef6f50c82a876278bfda12e838ea085dd63f84c34815c0ef1c5
|
||||
FROM chill/base-image:8.4-edge
|
||||
|
||||
# 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/.
|
||||
# copy directories
|
||||
|
||||
COPY --chown=www-data:www-data ./.env /var/www/app/.env
|
||||
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
|
||||
# - 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 chmod +x /entrypoint.sh
|
||||
|
||||
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" ]
|
||||
@@ -3,7 +3,7 @@ version: '3'
|
||||
services:
|
||||
###> symfony/mailer ###
|
||||
mailer:
|
||||
image: axllent/mailpit@sha256:9b3a463be15354c0f0eba91697d80e3e0d8a5623ef0e627cacc836bc17fd5231
|
||||
image: axllent/mailpit
|
||||
ports:
|
||||
- "1025"
|
||||
- "8025"
|
||||
|
||||
+2
-2
@@ -17,9 +17,9 @@ services:
|
||||
|
||||
###> chill-project/chill-bundles ###
|
||||
redis:
|
||||
image: redis@sha256:de1068af6f552240dfab67bcc9bfef99bfc60f776bb4580ef077ea4c8c97e848
|
||||
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:
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM nginx@sha256:5ab5b0b01097420873a3f3330f44248e34a3c2a3e8d5ee30658aeae8cb7435da
|
||||
FROM nginx
|
||||
|
||||
COPY ./public /var/www/app/public
|
||||
|
||||
|
||||
@@ -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 "${@}"
|
||||
|
||||
+1
-1
@@ -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": "^12.0.0"
|
||||
},
|
||||
"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",
|
||||
|
||||
Reference in new issue
Block a user