Merge branch 'release/1.2.15'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # nystudio107/docker-images Change Log
 
+## 1.2.15 - 2021.06.11
+### Changed
+* Cleaned up the `php-dev-craft` & `php-prod-craft` Dockerfile file permissions
+
 ## 1.2.14 - 2021.06.11
 ### Added
 * Added GitHub actions for automated Docker image building & pushing

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

@@ -45,14 +45,11 @@ RUN set -eux; \
 
 WORKDIR /var/www/project
 
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
+RUN mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 

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

@@ -47,14 +47,11 @@ RUN set -eux; \
 
 WORKDIR /var/www/project
 
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
+RUN mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 

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

@@ -45,14 +45,11 @@ RUN set -eux; \
 
 WORKDIR /var/www/project
 
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
+RUN mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 

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

@@ -47,14 +47,11 @@ RUN set -eux; \
 
 WORKDIR /var/www/project
 
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
+RUN mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 

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

@@ -46,19 +46,13 @@ RUN set -eux; \
 WORKDIR /var/www/project
 
 COPY ./run_queue.sh .
-RUN chmod a+x run_queue.sh
-
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
-
-# Permissions
-RUN chown -R www-data:www-data /var/www/project/cms/web
+RUN chmod a+x run_queue.sh \
+    && \
+    mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 
@@ -75,12 +69,6 @@ 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/cms/vendor \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/storage \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/web \
     && \
     composer craft-update \
     && \

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

@@ -48,19 +48,13 @@ RUN set -eux; \
 WORKDIR /var/www/project
 
 COPY ./run_queue.sh .
-RUN chmod a+x run_queue.sh
-
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
-
-# Permissions
-RUN chown -R www-data:www-data /var/www/project/cms/web
+RUN chmod a+x run_queue.sh \
+    && \
+    mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 
@@ -77,12 +71,6 @@ 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/cms/vendor \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/storage \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/web \
     && \
     composer craft-update \
     && \

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

@@ -46,19 +46,13 @@ RUN set -eux; \
 WORKDIR /var/www/project
 
 COPY ./run_queue.sh .
-RUN chmod a+x run_queue.sh
-
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
-
-# Permissions
-RUN chown -R www-data:www-data /var/www/project/cms/web
+RUN chmod a+x run_queue.sh \
+    && \
+    mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 
@@ -75,12 +69,6 @@ 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/cms/vendor \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/storage \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/web \
     && \
     composer craft-update \
     && \

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

@@ -48,19 +48,13 @@ RUN set -eux; \
 WORKDIR /var/www/project
 
 COPY ./run_queue.sh .
-RUN chmod a+x run_queue.sh
-
-# Create the storage directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/storage && \
-    mkdir -p /var/www/project/cms/storage/runtime && \
-    chown -R www-data:www-data /var/www/project/cms/storage
-
-# Create the cpresources directory and make it writeable by PHP
-RUN mkdir -p /var/www/project/cms/web/cpresources && \
-    chown -R www-data:www-data /var/www/project/cms/web/cpresources
-
-# Permissions
-RUN chown -R www-data:www-data /var/www/project/cms/web
+RUN chmod a+x run_queue.sh \
+    && \
+    mkdir -p /var/www/project/cms/storage \
+    && \
+    mkdir -p /var/www/project/cms/web/cpresources \
+    && \
+    chown -R www-data:www-data /var/www/project
 
 WORKDIR /var/www/project/cms
 
@@ -77,12 +71,6 @@ 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/cms/vendor \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/storage \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/web \
     && \
     composer craft-update \
     && \