ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-04-29 02:22:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use docker healthcheck for authentik

Browse Source
This commit is contained in:
Jamie Curnow 2024-11-13 10:28:02 +10:00
parent 331c761a1c
commit 2145df0dfb
No known key found for this signature in database
GPG Key ID: FFBB624C43388E9E
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ci/fulltest-cypress
View File

@ -79,7 +79,7 @@ bash "$DIR/../wait-healthy" "$(docker-compose ps --all -q fullstack)" 120
# Wait for authentik to be healthy, if it exists as a compose service # Wait for authentik to be healthy, if it exists as a compose service
if [ "$(docker-compose ps --all -q authentik)" != "" ]; then if [ "$(docker-compose ps --all -q authentik)" != "" ]; then
bash "$DIR/../wait-healthy" "$(docker-compose ps --all -q authentik)" 90 bash "$DIR/../wait-healthy" "$(docker-compose ps --all -q authentik)" 90 'true'
fi fi
# Run tests # Run tests

11
scripts/wait-healthy
View File

@ -5,17 +5,24 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
if [ "$1" == "" ]; then if [ "$1" == "" ]; then
echo "Waits for a docker container to be healthy." echo "Waits for a docker container to be healthy."
echo "Usage: $0 docker-container 30" echo " Usage: $0 docker-container 30"
echo "or use the third parameter to use the docker healthcheck instead of the internal one."
echo " Usage: $0 docker-container 30 true"
exit 1 exit 1
fi fi
SERVICE=$1 SERVICE=$1
LIMIT=${2:-90} LIMIT=${2:-90}
USE_DOCKER_HEALTHCHECK=${3:-false}
echo -e "${BLUE}❯ ${CYAN}Waiting for healthy: ${YELLOW}${SERVICE}${RESET}" echo -e "${BLUE}❯ ${CYAN}Waiting for healthy: ${YELLOW}${SERVICE}${RESET}"
is_up() { is_up() {
docker exec "$SERVICE" /bin/healthcheck.sh if [ "$USE_DOCKER_HEALTHCHECK" == "true" ]; then
docker inspect --format='{{.State.Health.Status}}' "$SERVICE" | grep -qi "healthy"
else
docker exec "$SERVICE" /bin/healthcheck.sh
fi
} }
i=0 i=0