Skip to content

Commit 1a80954

Browse files
Remove health check (#2334)
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.
1 parent 5621ab9 commit 1a80954

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

.github/workflows/submit.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ echo "database=$database"
1919
echo "ctest_driver=$ctest_driver"
2020
echo "submit_type=$submit_type"
2121

22+
# Wait a couple seconds for the migrations to start running
23+
sleep 2
24+
2225
# Wait for migrations to finish running by checking for maintenance mode to be lifted
2326
docker exec cdash bash -c "\
2427
until [ ! -f /cdash/storage/framework/down ]; \

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ ENTRYPOINT ["/bin/bash", "/cdash/docker/docker-entrypoint.sh"]
314314
###############################################################################
315315

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

320319
###############################################################################

docker/healthcheck.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

install.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ fi
6262
echo "Creating storage directories..."
6363
php artisan storage:mkdirs
6464

65+
echo "Waiting for database to come online..."
66+
until php artisan db:monitor ; do sleep 1; done
67+
6568
echo "Running migrations..."
6669
php artisan migrate --force
6770

0 commit comments

Comments
 (0)