Merge branch 'release/1.2.16'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # nystudio107/docker-images Change Log
 
+## 1.2.16 - 2021.06.15
+### Changed
+* Removed `USER` directive in the PHP containers, since the pool runs as `www-data` already
+* Fix permissions regression
+
 ## 1.2.15 - 2021.06.11
 ### Changed
 * Cleaned up the `php-dev-craft` & `php-prod-craft` Dockerfile file permissions

php-dev-craft/php-7.4-alpine/mariadb/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

php-dev-craft/php-7.4-alpine/postgres/Dockerfile

@@ -54,6 +54,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

php-dev-craft/php-8.0-alpine/mariadb/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

php-dev-craft/php-8.0-alpine/postgres/Dockerfile

@@ -54,6 +54,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

php-prod-craft/php-7.4-alpine/mariadb/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 \
     && \

php-prod-craft/php-7.4-alpine/postgres/Dockerfile

@@ -58,9 +58,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
@@ -71,6 +68,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 \
     && \

php-prod-craft/php-8.0-alpine/mariadb/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 \
     && \

php-prod-craft/php-8.0-alpine/postgres/Dockerfile

@@ -58,9 +58,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
@@ -71,6 +68,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 \
     && \