Merge branch 'release/2.4.39' into craft-webpack

nystudio107 · Jun 11, 2021 · 49d9279 · 49d9279
2 parents 03221f3 + 47425c5
commit 49d9279
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.4.39 - 2021.06.11
+### Changed
+* Removed whitelist settings in `tailwind.conf.js`
+* Cleaned up the `php-dev-craft` & `php-prod-craft` Dockerfile file permissions
+
 ## 2.4.38 - 2021.05.23
 ### Changed
 * Run php container as the `www-data` user to avoid permissions issues

diff --git a/buildchain/tailwind.config.js b/buildchain/tailwind.config.js
@@ -13,9 +13,6 @@ module.exports = {
     ],
     mode: 'layers',
     options: {
-      whitelist: [
-        '../src/css/components/**/*.{css}',
-      ],
     }
   },
   theme: {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,9 +30,10 @@ services:
     volumes: &php-volumes
       - cpresources:/var/www/project/cms/web/cpresources:delegated
       - storage:/var/www/project/cms/storage:delegated
+      - ./cms:/var/www/project/cms:cached
+      # Specific directories that need to be bind-mounted
       - ./cms/storage/logs:/var/www/project/cms/storage/logs:delegated
       - ./cms/storage/runtime/compiled_templates:/var/www/project/cms/storage/runtime/compiled_templates:delegated
-      - ./cms:/var/www/project/cms:cached
       - ./cms/vendor:/var/www/project/cms/vendor:delegated
   # php - run php-fpm with xdebug
   php_xdebug:

diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/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
 

diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/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,14 +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/config \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/storage \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/vendor \
-    && \
-    chown -R www-data:www-data /var/www/project/cms/web \
     && \
     composer craft-update \
     && \