Merge branch 'release/2.4.38' into craft-webpack

nystudio107 · May 23, 2021 · 03221f3 · 03221f3
2 parents 69f8a7b + 15e1633
commit 03221f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.38 - 2021.05.23
+### Changed
+* Run php container as the `www-data` user to avoid permissions issues
+
 ## 2.4.37 - 2021.05.14
 ### Changed
 * Added `logs` and `compiled_templates` dirs back in, so they appear on the client side

diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile
@@ -55,3 +55,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
     chown -R www-data:www-data /var/www/project/cms/web/cpresources
 
 WORKDIR /var/www/project/cms
+
+# run container as the www-data user
+USER www-data
diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile
@@ -62,6 +62,9 @@ RUN chown -R www-data:www-data /var/www/project/cms/web
 
 WORKDIR /var/www/project/cms
 
+# run container as the www-data user
+USER www-data
+
 # Force permissions, update Craft, and start php-fpm
 
 # Do a `composer install` without running any Composer scripts