From b03f1f5bb60083b58c471c93677b5019cca33b76 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sun, 23 May 2021 15:57:20 -0400 Subject: [PATCH 1/8] Change order --- docker-config/php-dev-craft/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile index 6d390c7..879aec1 100755 --- a/docker-config/php-dev-craft/Dockerfile +++ b/docker-config/php-dev-craft/Dockerfile @@ -54,7 +54,7 @@ RUN mkdir -p /var/www/project/cms/storage && \ 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 + +WORKDIR /var/www/project/cms From 2497095afdfc2d5496ddd740455ff93b45a9c09e Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sun, 23 May 2021 15:59:14 -0400 Subject: [PATCH 2/8] Revert order --- docker-config/php-dev-craft/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile index 879aec1..6d390c7 100755 --- a/docker-config/php-dev-craft/Dockerfile +++ b/docker-config/php-dev-craft/Dockerfile @@ -54,7 +54,7 @@ RUN mkdir -p /var/www/project/cms/storage && \ 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 - -WORKDIR /var/www/project/cms From 967d3c5e6600acc95b30ecdcc6a78e2aa0b16ccb Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 11 Jun 2021 11:25:46 -0400 Subject: [PATCH 3/8] Remove whitelist --- buildchain/tailwind.config.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/buildchain/tailwind.config.js b/buildchain/tailwind.config.js index cc10341..219a3dc 100644 --- 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: { From 087575ec6fb307e65755ebc23528ea18dc5bb6bd Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 11 Jun 2021 11:27:18 -0400 Subject: [PATCH 4/8] Version 2.4.39 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc13335..e186439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nystudio107/craft Change Log +## 2.4.39 - UNRELEASED +### Changed +* Removed whitelist settings in `tailwind.conf.js` + ## 2.4.38 - 2021.05.23 ### Changed * Run php container as the `www-data` user to avoid permissions issues From e13d814bfb0045d959b268f69b0f5432a9135bbc Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 11 Jun 2021 12:27:39 -0400 Subject: [PATCH 5/8] Cleaned up the `php-dev-craft` & `php-prod-craft` Dockerfile file permissions --- docker-config/php-dev-craft/Dockerfile | 13 +++++------- docker-config/php-prod-craft/Dockerfile | 28 +++++++------------------ 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile index 6d390c7..d18ffc5 100755 --- 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 index 501715a..fb71e39 100755 --- 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 \ && \ From 4e01b9226bc8df0b8cb837d97d38ac6cfc559488 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 11 Jun 2021 12:27:46 -0400 Subject: [PATCH 6/8] Added comment --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a6fd852..15243f8 100755 --- 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: From 90ff0a1ad8a8a211f2627d3aa733d1b16cd68a46 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 11 Jun 2021 12:28:08 -0400 Subject: [PATCH 7/8] Version 2.4.39 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e186439..391746b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 2.4.39 - UNRELEASED ### 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 From 47425c53386a5cea37c545ccd92c611d81506675 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 11 Jun 2021 12:37:00 -0400 Subject: [PATCH 8/8] Version 2.4.39 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 391746b..d7fd6be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # nystudio107/craft Change Log -## 2.4.39 - UNRELEASED +## 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