Skip to content
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.

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

Update healthcheck intervals and paths #113

Merged
merged 2 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ WORKDIR /var/www/html
RUN rm -rf .codepipeline

# Healthcheck to ensure nginx is running and cmfive is installed
HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=15 \
HEALTHCHECK --interval=15s --timeout=5m --start-period=5s --retries=15 \
CMD curl -s -o /dev/null -w "%{http_code}" http://localhost | grep -q -E "^[1-3][0-9]{2}$" && \
test -f /home/cmfive/.cmfive-installed

Expand Down
9 changes: 3 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ services:

webapp:
image: ghcr.io/2pisoftware/cmfive:develop
# build:
# context: .
# dockerfile: Dockerfile
# container_name: cmfive
container_name: cmfive
hostname: nginx-php8.1
environment:
- TZ=Australia/Sydney
Expand Down Expand Up @@ -66,8 +63,8 @@ services:
test:
- "CMD-SHELL"
- "ps aux | grep 'npm run watch' | grep -v grep"
- "test -f system/templates/base/dist/app.css"
interval: 10s
- "test -f /var/www/html/system/templates/base/dist/app.css"
interval: 15s
timeout: 5m
retries: 20
restart: unless-stopped
Expand Down
Loading