Skip to content

Commit

Permalink
Remove health check (#2334)
Browse files Browse the repository at this point in the history
The health check built into our Docker image has caused significant
problems across a variety of different system configurations. The health
check is rather rudimentary and its effectiveness is limited, especially
given that CDash can accept submissions without a working database
connection.

This PR simply removes the health check altogether, in favor of
client-specific implementations if a health check is desired.
  • Loading branch information
williamjallen authored Jul 10, 2024
1 parent 5621ab9 commit 1a80954
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/submit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ echo "database=$database"
echo "ctest_driver=$ctest_driver"
echo "submit_type=$submit_type"

# Wait a couple seconds for the migrations to start running
sleep 2

# Wait for migrations to finish running by checking for maintenance mode to be lifted
docker exec cdash bash -c "\
until [ ! -f /cdash/storage/framework/down ]; \
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ ENTRYPOINT ["/bin/bash", "/cdash/docker/docker-entrypoint.sh"]
###############################################################################

FROM cdash-non-root-intermediate AS cdash
HEALTHCHECK --interval=5s --timeout=1s CMD ["/bin/bash", "/cdash/docker/healthcheck.sh"]
CMD ["start-website"]

###############################################################################
Expand Down
7 changes: 0 additions & 7 deletions docker/healthcheck.sh

This file was deleted.

3 changes: 3 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ fi
echo "Creating storage directories..."
php artisan storage:mkdirs

echo "Waiting for database to come online..."
until php artisan db:monitor ; do sleep 1; done

echo "Running migrations..."
php artisan migrate --force

Expand Down

0 comments on commit 1a80954

Please sign in to comment.