Merge branch 'release/2.4.40' into craft-webpack

nystudio107 · Jun 15, 2021 · de3a340 · de3a340
2 parents 49d9279 + 116b1d1
commit de3a340
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.4.40 - 2021.06.15
+### Changed
+* Removed `USER` directive in the PHP containers, since the pool runs as `www-data` already
+* Fix permissions regression
+
 ## 2.4.39 - 2021.06.11
 ### Changed
 * Removed whitelist settings in `tailwind.conf.js`

diff --git a/README.md b/README.md
@@ -42,11 +42,11 @@ You can read more about it in the [Setting up a New Craft 3 CMS Project](https:/
 
 This project package works exactly the way Pixel & Tonic's [craftcms/craft](https://github.com/craftcms/craft) package works; you create a new project by first creating & installing the project:
 
-    composer create-project nystudio107/craft PATH --no-install
+    composer create-project nystudio107/craft PATH --no-install --remove-vcs
 
 Make sure that `PATH` is the path to your project, including the name you want for the project, e.g.:
 
-    composer create-project nystudio107/craft craft3 --no-install
+    composer create-project nystudio107/craft craft3 --no-install --remove-vcs
 
 We use `--no-install` so that the composer packages for the root project are not installed.
 

diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile
@@ -52,6 +52,3 @@ RUN mkdir -p /var/www/project/cms/storage \
     chown -R www-data:www-data /var/www/project
 
 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
@@ -56,9 +56,6 @@ RUN chmod a+x run_queue.sh \
 
 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
@@ -69,6 +66,8 @@ USER www-data
 # but saves far more time in not having to deal with out of sync versions
 # when working with teams or multiple environments
 CMD composer install --verbose --no-progress --no-scripts --optimize-autoloader --no-interaction \
+    && \
+    chown -R www-data:www-data /var/www/project
     && \
     composer craft-update \
     && \