From 3902dfe14071171c408026f5850e6958cac281d3 Mon Sep 17 00:00:00 2001 From: riley Date: Mon, 16 Oct 2023 15:48:47 -0400 Subject: [PATCH] more status polling fixes --- root/usr/libexec/apps/whoogle/whoogle.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/root/usr/libexec/apps/whoogle/whoogle.sh b/root/usr/libexec/apps/whoogle/whoogle.sh index b69f943..0a92a33 100644 --- a/root/usr/libexec/apps/whoogle/whoogle.sh +++ b/root/usr/libexec/apps/whoogle/whoogle.sh @@ -30,9 +30,6 @@ do_install_detail() { [ -z "$port" ] && port=5000 [ -z "$IMAGE_NAME" ] && IMAGE_NAME=benbusby/whoogle-search - - # Create Docker Compose file with custom variables - # Create Docker Compose file with custom variables rm -R /opt/docker2/compose/whoogle-app mkdir /opt/docker2/compose/whoogle-app @@ -130,8 +127,14 @@ case ${ACTION} in docker ${ACTION} whoogle ;; "status") - docker ps --all -f 'name=whoogle' --format '{{.State}}' - ;; + CONTAINER_NAME=$(docker ps -a --filter "name=whoogle-search" --format '{{.Names}}') + CONTAINER_STATUS=$(docker ps --all --filter "name=${CONTAINER_NAME}" --format '{{.Status}}' | awk '/^Up/ { print "up " substr($0, 4) } !/^Up/ && /.+/ { print "down" }') + if [ -z "$CONTAINER_NAME" ]; then + echo "Whoogle is not installed" + else + echo "${CONTAINER_STATUS}" + fi + ;; "port") docker ps --all -f 'name=whoogle' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;;