From b1950f9a5f4fca87f669eba5ee924f16d77eda45 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 7 Apr 2022 11:25:15 -0400 Subject: [PATCH 1/7] refactor: Run migrations first --- cms/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/composer.json b/cms/composer.json index 7b66be5..528bb28 100644 --- a/cms/composer.json +++ b/cms/composer.json @@ -40,8 +40,8 @@ "post-craft-update": [ "Composer\\Config::disableProcessTimeout", "@php craft install/check && php craft clear-caches/all --interactive=0 || exit 0", - "@php craft install/check && php craft project-config/apply --interactive=0 || exit 0", - "@php craft install/check && php craft migrate/all --interactive=0 || exit 0" + "@php craft install/check && php craft migrate/all --interactive=0 || exit 0", + "@php craft install/check && php craft project-config/apply --interactive=0 || exit 0" ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" From c7eae940b2fc6bdb556eb47b15a34d6b5a756fa8 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 7 Apr 2022 11:27:35 -0400 Subject: [PATCH 2/7] chore: Version 2.5.7 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f82bc..f3eb8bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nystudio107/craft Change Log +## 2.5.7 - UNRELEASED +### Changed +* Run migrations first via `composer.json` scripts, because Craft won't apply Project Config if there are pending migrations + ## 2.5.6 - 2022.03.30 ### Changed * Fix `WORKDIR` in `php-prod-craft` container so `make craft` etc. commands work as expected From aec26fb99142dcdeed9e7711cc067e738f170878 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 7 Apr 2022 18:45:24 -0400 Subject: [PATCH 3/7] refactor: Added `tty: true` back in now that the issue has been fixed in the Docker Compose API `2.4.1` ([#9348](https://github.com/docker/compose/pull/9348)) --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4771fe7..2e9cfe8 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: expose: - "9000" init: true + tty: true volumes: &php-volumes - cpresources:/var/www/project/cms/web/cpresources:delegated - storage:/var/www/project/cms/storage:delegated @@ -48,6 +49,7 @@ services: expose: - "9000" init: true + tty: true volumes: *php-volumes # queue - runs queue jobs via php craft queue/listen @@ -60,6 +62,7 @@ services: env_file: *env init: true + tty: true volumes: *php-volumes # mariadb - database @@ -98,6 +101,7 @@ services: init: true ports: - "3000:3000" + tty: true volumes: - ./buildchain:/var/www/project/buildchain:cached - ./buildchain/node_modules:/var/www/project/buildchain/node_modules:delegated From b672dcb727e63f4ea2e27d762e65f9ad06ab6ea4 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 7 Apr 2022 18:45:32 -0400 Subject: [PATCH 4/7] chore: Version 2.5.7 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3eb8bf..e5b1a18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 2.5.7 - UNRELEASED ### Changed * Run migrations first via `composer.json` scripts, because Craft won't apply Project Config if there are pending migrations +* Added `tty: true` back in now that the issue has been fixed in the Docker Compose API `2.4.1` ([#9348](https://github.com/docker/compose/pull/9348)) ## 2.5.6 - 2022.03.30 ### Changed From 42d1134d148c5f919acfd658dccd3549d13bfb68 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 8 Apr 2022 17:01:10 -0400 Subject: [PATCH 5/7] refactor: Wait for both `vendor/autoload.php` as we as `composer.lock` before starting up the queue listener --- docker-config/php-prod-craft/run_queue.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-config/php-prod-craft/run_queue.sh b/docker-config/php-prod-craft/run_queue.sh index 5f7adc3..e75ddae 100755 --- a/docker-config/php-prod-craft/run_queue.sh +++ b/docker-config/php-prod-craft/run_queue.sh @@ -21,7 +21,7 @@ do done # Wait until the `composer install` is done by looking for the `vendor/autoload.php` file echo "### Waiting for vendor/autoload.php" -while [ ! -f vendor/autoload.php ] +while [ ! -f vendor/autoload.php ] || [ ! -f composer.lock ] do sleep 1 done From 5adddde87f6598000c40c9adb4f541b7043033a0 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 8 Apr 2022 17:02:56 -0400 Subject: [PATCH 6/7] chore: Version 2.5.7 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5b1a18..7a95369 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Changed * Run migrations first via `composer.json` scripts, because Craft won't apply Project Config if there are pending migrations * Added `tty: true` back in now that the issue has been fixed in the Docker Compose API `2.4.1` ([#9348](https://github.com/docker/compose/pull/9348)) +* Wait for both `vendor/autoload.php` as we as `composer.lock` before starting up the queue listener ## 2.5.6 - 2022.03.30 ### Changed From 0b6d9f63be1dcd4602e45279979c8ca4bcf16a63 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 8 Apr 2022 18:31:18 -0400 Subject: [PATCH 7/7] chore: Version 2.5.7 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a95369..f3160c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # nystudio107/craft Change Log -## 2.5.7 - UNRELEASED +## 2.5.7 - 2022.04.08 ### Changed * Run migrations first via `composer.json` scripts, because Craft won't apply Project Config if there are pending migrations * Added `tty: true` back in now that the issue has been fixed in the Docker Compose API `2.4.1` ([#9348](https://github.com/docker/compose/pull/9348))