Skip to content

Minor fixes to compose.healthcheck.yaml and Makefile #1352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release/next
Choose a base branch
from
Open

Minor fixes to compose.healthcheck.yaml and Makefile #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82f1005
increase healthcheck retries to 30
mrifqyabdallah Jun 19, 2025
f947393
fixed syntax
mrifqyabdallah Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions compose/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ help:
@echo ""
@echo "$(call yellow,Use the following CLI commands:)"
@echo "$(call red,===============================)"
@echo "$(call format,analyse,'Run `phpstan analyse` within the container to statically analyse code, passing in directory to analyse.')"
@echo "$(call format,analyse,'Run \`phpstan analyse\` within the container to statically analyse code$(comma) passing in directory to analyse.')"
@echo "$(call format,bash,'Drop into the bash prompt of your Docker container.')"
@echo "$(call format,blackfire,'Disable or enable Blackfire. Accepts argument `disable`, `enable`, or `status`.')"
@echo "$(call format,blackfire,'Disable or enable Blackfire. Accepts argument \`disable\`$(comma) \`enable\`$(comma) or \`status\`.')"
@echo "$(call format,cache-clean,'Access the cache-clean CLI.')"
@echo "$(call format,check-dependencies,'Provides helpful recommendations for dependencies.')"
@echo "$(call format,cli,'Run any CLI command without going into the bash prompt.')"
@echo "$(call format,clinotty,'Run any CLI command with no TTY.')"
@echo "$(call format,cliq,'Run any CLI command but pipe all output to /dev/null.')"
@echo "$(call format,composer,'Run the composer binary.')"
@echo "$(call format,configure-linux`,'Adds the Docker container IP address to /etc/hosts if not already present. Optionally enables port 9003 for Xdebug')"
@echo "$(call format,configure-linux,'Adds the Docker container IP address to /etc/hosts if not already present. Optionally enables port 9003 for Xdebug.')"
@echo "$(call format,copyfromcontainer,'Copy folders or files from container to host.')"
@echo "$(call format,copytocontainer,'Copy folders or files from host to container.')"
@echo "$(call format,create-user,'Create either an admin user or customer account.')"
@echo "$(call format,cron,'Start or stop the cron service.')"
@echo "$(call format,debug-cli,'Enable Xdebug for bin/magento, with an optional argument of the IDE key. Defaults to PHPSTORM.')"
@echo "$(call format,deploy,'Runs the standard Magento deployment process commands. Pass extra locales besides `en_US` via an optional argument.')"
@echo "$(call format,dev-test-run,' Facilitates running PHPUnit tests for a specified test type.')"
@echo "$(call format,debug-cli,'Enable Xdebug for bin/magento$(comma) with an optional argument of the IDE key. Defaults to PHPSTORM.')"
@echo "$(call format,deploy,'Runs the standard Magento deployment process commands. Pass extra locales besides \`en_US\` via an optional argument.')"
@echo "$(call format,dev-test-run,'Facilitates running PHPUnit tests for a specified test type.')"
@echo "$(call format,dev-urn-catalog-generate,'Generate URNs for PHPStorm and remap paths to local host.')"
@echo "$(call format,devconsole,'Alias for n98-magerun2 dev:console.')"
@echo "$(call format,docker-compose,'Support V1 (`docker-compose`) and V2 (`docker compose`) docker compose command, and use custom configuration files.')"
@echo "$(call format,docker-start,'Start the Docker application (either Orbstack or Docker Desktop)"
@echo "$(call format,docker-compose,'Support V1 (\`docker-compose\`) and V2 (\`docker compose\`) docker compose command$(comma) and use custom configuration files.')"
@echo "$(call format,docker-start,'Start the Docker application (either Orbstack or Docker Desktop).')"
@echo "$(call format,docker-stats,'Display status for CPU$(comma) memory usage$(comma) and memory limit of currently-running Docker containers.')"
@echo "$(call format,download,'Download & extract specific Magento version to the src directory.')"
@echo "$(call format,ece-patches,'Run the Cloud Patches CLI.')"
Expand All @@ -49,7 +49,7 @@ help:
@echo "$(call format,install-php-extensions,'Install PHP extension in the container.')"
@echo "$(call format,log,'Monitor the Magento log files. Pass no params to tail all files.')"
@echo "$(call format,magento,'Run the Magento CLI.')"
@echo "$(call format,magento-version,'Determine the Magento version installed in the current environment..')"
@echo "$(call format,magento-version,'Determine the Magento version installed in the current environment.')"
@echo "$(call format,mftf,'Run the Magento MFTF.')"
@echo "$(call format,mysql,'Run the MySQL CLI with database config from env/db.env.')"
@echo "$(call format,mysqldump,'Backup the Magento database.')"
Expand All @@ -58,7 +58,7 @@ help:
@echo "$(call format,npm,'Run the npm binary.')"
@echo "$(call format,phpcbf,'Auto-fix PHP_CodeSniffer errors with Magento2 options.')"
@echo "$(call format,phpcs,'Run PHP_CodeSniffer with Magento2 options.')"
@echo "$(call format,phpcs-json-report,'Run PHP_CodeSniffer with Magento2 options and save to `report.json` file.')"
@echo "$(call format,phpcs-json-report,'Run PHP_CodeSniffer with Magento2 options and save to \`report.json\` file.')"
@echo "$(call format,pwa-studio,'(BETA) Start the PWA Studio server.')"
@echo "$(call format,redis,'Run a command from the redis container.')"
@echo "$(call format,remove,'Remove all containers.')"
Expand All @@ -78,14 +78,14 @@ help:
@echo "$(call format,setup-pwa-studio-sampledata,'This script makes it easier to install Venia sample data.')"
@echo "$(call format,setup-ssl,'Generate an SSL certificate for one or more domains.')"
@echo "$(call format,setup-ssl-ca,'Generate a certificate authority and copy it to the host.')"
@echo "$(call format,spx,'Disable or enable output compression to enable or disbale SPX.')"
@echo "$(call format,spx,'Disable or enable output compression to enable or disable SPX.')"
@echo "$(call format,start,'Start all containers.')"
@echo "$(call format,status,'Check the container status.')"
@echo "$(call format,stop,'Stop all project containers.')"
@echo "$(call format,stopall,'Stop all docker running containers.')"
@echo "$(call format,test,'Run unit tests for a specific path.')"
@echo "$(call format,update,'Update your project to the latest version of docker-magento.')"
@echo "$(call format,xdebug,'Set a custom xdebug.mode, or check the current status and get all available modes . Accepts optional argument of mode `off`, `debug`, etc.')"
@echo "$(call format,xdebug,'Set a custom xdebug.mode$(comma) or check the current status and get all available modes . Accepts optional argument of mode \`off\`$(comma) \`debug\`$(comma) etc.')"


analyse:
Expand Down
2 changes: 1 addition & 1 deletion compose/compose.healthcheck.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
x-healthcheck-defaults: &healthcheck-defaults
interval: 5s
timeout: 5s
retries: 3
retries: 30

x-healthcheck-slow-start: &healthcheck-slow-start
<<: *healthcheck-defaults
Expand Down