From 3852d6342eafa7e1e10fabe758732edef2352d70 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 09:21:02 -0400 Subject: [PATCH 01/10] Added `yiisoft/yii2-shell` to `require-dev` --- cms/composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cms/composer.json b/cms/composer.json index 562e40c..ab27c01 100644 --- a/cms/composer.json +++ b/cms/composer.json @@ -12,6 +12,9 @@ "nystudio107/craft-webperf": "^1.0.0", "nystudio107/craft-twigpack": "^1.1.0" }, + "require-dev": { + "yiisoft/yii2-shell": "^2.0.3" + }, "autoload": { "psr-4": { "modules\\sitemodule\\": "modules/sitemodule/src/" From 22614a2b1ab61c92f8aabb29335980ed4222ed60 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 09:21:10 -0400 Subject: [PATCH 02/10] Version 2.3.15 --- CHANGELOG.md | 6 +++++- composer.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d381356..dbd2f13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ # nystudio107/craft Change Log +## 2.3.15 - 2020.10.26 +### Added +* Added `yiisoft/yii2-shell` to `require-dev` + ## 2.3.14 - 2020.10.25 ### Added * Added `/cms/web/dist/*` to root `.gitignore` -* Use a separate php_xdebug container only when the `XDEBUG_SESSION` cookie is set, so regular requests are more performant +* Use a separate `php_xdebug` container only when the `XDEBUG_SESSION` cookie is set, so regular requests are more performant ## 2.3.13 - 2020.09.25 ### Added diff --git a/composer.json b/composer.json index 16bc41e..6162263 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "craftcms/craft", "description": "nystudio107 Craft 3.4 CMS scaffolding project", - "version": "2.3.14", + "version": "2.3.15", "keywords": [ "craft", "cms", From 3d80dbd8263ecc02c03d1d44607118d8e6287904 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 09:54:21 -0400 Subject: [PATCH 03/10] Add `--no-dev --no-progress` to the composer install command --- buddy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buddy.yml b/buddy.yml index bf9b2e0..993301a 100644 --- a/buddy.yml +++ b/buddy.yml @@ -25,7 +25,7 @@ docker_image_tag: "latest" execute_commands: - "cd cms" - - "composer install --no-scripts --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs" + - "composer install --no-dev --no-progress --no-scripts --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs" setup_commands: - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" - "apt-get update && apt-get install -y git zip" From 899e32be0df78ae429f0826761f3b320bbd40452 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 09:54:58 -0400 Subject: [PATCH 04/10] Version 2.3.15 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbd2f13..5f1ad19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 2.3.15 - 2020.10.26 ### Added * Added `yiisoft/yii2-shell` to `require-dev` +* Add `--no-dev --no-progress` to the composer install command ## 2.3.14 - 2020.10.25 ### Added From c35cfa0439b23f039dd79b532109d66e1ffa64d9 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 12:05:39 -0400 Subject: [PATCH 05/10] Ignore Nginx requests for `favicon.ico` --- docker-config/nginx/default.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-config/nginx/default.conf b/docker-config/nginx/default.conf index 98e36fb..926a2b1 100755 --- a/docker-config/nginx/default.conf +++ b/docker-config/nginx/default.conf @@ -26,6 +26,8 @@ server { access_log off; error_log /dev/stdout info; + location = /favicon.ico { access_log off; log_not_found off; } + location / { try_files $uri/index.html $uri $uri/ /index.php?$query_string; } From 63a7f97658cff1761fb307276e3fc2f2918e3212 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 12:05:46 -0400 Subject: [PATCH 06/10] Version 2.3.15 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f1ad19..2abe01f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ * Added `yiisoft/yii2-shell` to `require-dev` * Add `--no-dev --no-progress` to the composer install command +### Changed +* Ignore Nginx requests for `favicon.ico` + ## 2.3.14 - 2020.10.25 ### Added * Added `/cms/web/dist/*` to root `.gitignore` From bce5ba7d79f5ea364698e264de7b3e8db5cbc53f Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 15:55:35 -0400 Subject: [PATCH 07/10] Use port `9003` for `xdebug` --- docker-config/php-dev-base/xdebug.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-config/php-dev-base/xdebug.ini b/docker-config/php-dev-base/xdebug.ini index 4a17ef8..65bddab 100644 --- a/docker-config/php-dev-base/xdebug.ini +++ b/docker-config/php-dev-base/xdebug.ini @@ -1,6 +1,6 @@ xdebug.default_enable=1 xdebug.remote_enable=1 -xdebug.remote_port=9000 +xdebug.remote_port=9003 xdebug.remote_handler=dbgp xdebug.remote_connect_back=1 xdebug.remote_host=host.docker.internal From 118a1d391794aacce7b80b1a7b1b7cce73662b08 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 22:33:10 -0400 Subject: [PATCH 08/10] Removed deprecated `links` from `docker-compose.yaml` Signed-off-by: Andrew Welch --- docker-compose.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 825bd22..461e58d 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,6 @@ services: env_file: &env - ./cms/.env init: true - links: - - php ports: - "8000:80" volumes: @@ -29,9 +27,6 @@ services: expose: - "9000" init: true - links: &php-links - - mariadb - - redis volumes: &php-volumes - cpresources:/var/www/project/cms/web/cpresources - storage:/var/www/project/cms/storage @@ -50,8 +45,6 @@ services: expose: - "9000" init: true - links: - *php-links user: www-data volumes: *php-volumes @@ -67,8 +60,6 @@ services: expose: - "9001" init: true - links: - *php-links user: www-data volumes: *php-volumes From 0c62057bcf3dd4739c39a46ddcf99ef03e9c9cb5 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 22:34:11 -0400 Subject: [PATCH 09/10] Use Composer 2.x Signed-off-by: Andrew Welch --- docker-config/php-dev-craft/Dockerfile | 2 +- docker-config/php-prod-craft/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile index 0e652fa..c5555a1 100755 --- a/docker-config/php-dev-craft/Dockerfile +++ b/docker-config/php-dev-craft/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update \ pdo_mysql \ && \ # Install Composer - curl -sS https://getcomposer.org/installer | php -- --version=1.10.16 --install-dir=/usr/local/bin/ --filename=composer \ + curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Clean apt repo caches that don't need to be part of the image && \ apt-get clean \ diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile index 4a5fdd7..507e484 100755 --- a/docker-config/php-prod-craft/Dockerfile +++ b/docker-config/php-prod-craft/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ pdo_mysql \ && \ # Install Composer - curl -sS https://getcomposer.org/installer | php -- --version=1.10.16 --install-dir=/usr/local/bin/ --filename=composer \ + curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Clean apt repo caches that don't need to be part of the image && \ apt-get clean \ From 8d0e8c88b07f1517dd6c08cfedf3798a51e91927 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 26 Oct 2020 22:34:20 -0400 Subject: [PATCH 10/10] Version 2.3.15 Signed-off-by: Andrew Welch --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2abe01f..e19a525 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ ### Changed * Ignore Nginx requests for `favicon.ico` +* Removed deprecated `links` from `docker-compose.yaml` +* Use Composer 2.x ## 2.3.14 - 2020.10.25 ### Added