Skip to content

Commit

Permalink
Merge branch 'hotfix/v2.3.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
ambroisemaupate committed Jun 11, 2024
2 parents a9ad8d1 + c96005c commit 04065bb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to project will be documented in this file.

## [2.3.7](https://github.com/roadiz/skeleton/compare/v2.3.6...v2.3.7) - 2024-06-11

### Bug Fixes

- Fix root folder permissions, do not chown twice during Dockerfile build - ([fe8a101](https://github.com/roadiz/skeleton/commit/fe8a10189d5b361800990bb765103a2f6c59c5ed)) - Ambroise Maupate

## [2.3.6](https://github.com/roadiz/skeleton/compare/v2.3.5...v2.3.6) - 2024-06-08

### Bug Fixes
Expand Down
16 changes: 15 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,21 @@ RUN ln -s /var/www/html/bin/console /usr/local/bin/console \
&& chmod +x /wait-for-it.sh \
&& chmod +x /usr/local/bin/docker-php-entrypoint \
&& chmod +x /usr/local/bin/docker-cron-entrypoint \
&& chown -R www-data:www-data /var/www/html/
&& chmod 0755 /var/www/html/bin/console \
&& chmod 0750 /var/www/html \
&& chmod 0750 \
/var/www/html/bin \
/var/www/html/config \
/var/www/html/docker \
/var/www/html/migrations \
/var/www/html/public \
/var/www/html/src \
/var/www/html/templates \
/var/www/html/themes \
/var/www/html/translations \
/var/www/html/var \
/var/www/html/vendor \
&& chown www-data:www-data /var/www/html

VOLUME /var/www/html/config/jwt \
/var/www/html/config/secrets \
Expand Down
3 changes: 1 addition & 2 deletions docker/php-fpm-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,4 @@ RUN ln -s /var/www/html/bin/console /usr/local/bin/console \
&& /usr/bin/crontab -u www-data /crontab.txt \
&& chmod +x /wait-for-it.sh \
&& chmod +x /usr/local/bin/docker-php-entrypoint \
&& chmod +x /usr/local/bin/docker-cron-entrypoint \
&& chown -R www-data:www-data /var/www/html/
&& chmod +x /usr/local/bin/docker-cron-entrypoint

0 comments on commit 04065bb

Please sign in to comment.