Repository navigation
chore: update docker compose template and PHP 8.5 - #70
Merged
Merged
Conversation
Restore the APP_PATH_PREFIX rewrite in nginx and the php-cs-fixer exclusions. Remove the JavaScript and styles workflows, because the project has no assets. Give the cron-metrics router the lowest priority on the server, because the importer uses the same domain.
Rector changes are syntax only: new without parentheses and #[\Override] on overridden properties.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #70 +/- ##
==========================================
Coverage 74.39% 74.39%
Complexity 264 264
==========================================
Files 30 30
Lines 738 738
==========================================
Hits 549 549
Misses 189 189
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Keep the APP_PATH_PREFIX rewrite in .docker/templates/server.d/, the same as event-database-imports, so template updates do not remove it. The include line matches itk-dev/devops_itkdev-docker#163.
Keep require.php at >=8.3, so that Rector does not apply the PHP 8.5 rules in this PR.
Open
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update the docker compose files from the ITK Dev
symfony-6template (itk-version 3.2.4) and change to PHP 8.5.This is step 1 of the quarterly update. The dependency updates come in a separate PR.
The PHP 8.5 requirement in
composer.jsonand the Rector PHP 8.5 fixes are in #71. This PR keepsrequire.phpat>=8.3, so that the Rector check does not apply the PHP 8.5 rules here.Changes
itkdev-docker-compose template:update(symfony-6). Thesymfony-6,symfony-7andsymfony-8templates are identical.APP_PATH_PREFIX(/api/v2/). The rewrite is now in.docker/templates/server.d/app-path-prefix.conf.template, the same as inevent-database-imports. Thus, the next template update does not remove it. Theincludeline indefault.conf.templateis the same as in feat: include project nginx config from server.d in templates devops_itkdev-docker#163. The comment now refers toevent-database-imports, because the legacy EventDB is shut down.config/reference.phpexclusion andphpdoc_align => falsein.php-cs-fixer.dist.php.javascript.yamlandstyles.yamlworkflows. The project has noassets/directory.php8.4-fpmimage pins fromdocker-compose.override.ymlanddocker-compose.server.override.yml. The template now sets the image (php8.5-fpm)./cron-metricsrouter to 1 indocker-compose.server.override.yml.php8.5.Taskfile.ymlwith the new Prettier rule for Taskfiles (single quotes).Why
The quarterly update keeps the templates and the PHP version current. The template moves the PHP image from 8.4 to 8.5.
The template adds a
/cron-metricsrouter. In production, this API andevent-database-importsuse the same domain, and both routers have the same rule. This API has no cron jobs. With priority 1, Traefik always sends/cron-metricsto the importer.Checks
After the deploy
https://<domain>/cron-metricsshows the statistics fromevent-database-imports./api/v2/(for example/api/v2/docs) load.