From 3f4a9c5b1c9e4419b43f6889f8e63ed3bc905973 Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Mon, 20 May 2024 05:09:53 +0000
Subject: [PATCH] build: fix "the input device is not a TTY"

---
 docker-runner/docker-run.sh         | 2 +-
 integration_tests/ftp/test.sh       | 2 +-
 integration_tests/http/setup.sh     | 2 +-
 integration_tests/ipp/test.sh       | 6 +++---
 integration_tests/postgres/setup.sh | 2 +-
 integration_tests/postgres/test.sh  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-runner/docker-run.sh b/docker-runner/docker-run.sh
index 7739fbf3..a13ed284 100755
--- a/docker-runner/docker-run.sh
+++ b/docker-runner/docker-run.sh
@@ -7,4 +7,4 @@
 : "${CONTAINER_NAME:?}"
 
 set -e
-echo 'target' | docker run --rm -it --link $CONTAINER_NAME:target zgrab2_runner $@
+echo 'target' | docker run --rm -i --link $CONTAINER_NAME:target zgrab2_runner $@
diff --git a/integration_tests/ftp/test.sh b/integration_tests/ftp/test.sh
index daa1088b..8eb4268b 100755
--- a/integration_tests/ftp/test.sh
+++ b/integration_tests/ftp/test.sh
@@ -22,7 +22,7 @@ echo "ftp/test: Testing FTP on $CONTAINER_NAME..."
 CONTAINER_NAME=$CONTAINER_NAME $ZGRAB_ROOT/docker-runner/docker-run.sh ftp > $OUTPUT_DIR/default.json
 
 echo "ftp/test: BEGIN vsftpd logs from $CONTAINER_NAME [{("
-docker exec -t $CONTAINER_NAME cat //var/log/vsftpd.log
+docker exec $CONTAINER_NAME cat //var/log/vsftpd.log
 echo ")}] END vsftpd logs from $CONTAINER_NAME"
 
 echo "ftp/test: BEGIN docker logs from $CONTAINER_NAME [{("
diff --git a/integration_tests/http/setup.sh b/integration_tests/http/setup.sh
index a69c90cb..9408b4d8 100755
--- a/integration_tests/http/setup.sh
+++ b/integration_tests/http/setup.sh
@@ -20,7 +20,7 @@ fi
 
 echo -n "http/setup: Waiting on $CONTAINER_NAME to start..."
 
-while ! docker exec -t $CONTAINER_NAME cat //var/log/lighttpd/error.log | grep -q "server started"; do
+while ! docker exec $CONTAINER_NAME cat //var/log/lighttpd/error.log | grep -q "server started"; do
     echo -n "."
 done
 
diff --git a/integration_tests/ipp/test.sh b/integration_tests/ipp/test.sh
index 8fac7b66..823381e3 100755
--- a/integration_tests/ipp/test.sh
+++ b/integration_tests/ipp/test.sh
@@ -82,14 +82,14 @@ for version in $versions; do
     # TODO: If there are any other relevant log files, dump those to stdout here.
     # FIXME: Only dump these 3 logs if they exist
     #echo "ipp/test: BEGIN cups logs from $CONTAINER_NAME [{("
-    #docker exec -t $CONTAINER_NAME cat //var/log/cups/access_log
+    #docker exec $CONTAINER_NAME cat //var/log/cups/access_log
     #echo ")}] END cups logs from $CONTAINER_NAME"
 
     #echo "ipp/test: BEGIN cups logs from $CONTAINER_NAME [{("
-    #docker exec -t $CONTAINER_NAME cat //var/log/cups/error_log
+    #docker exec $CONTAINER_NAME cat //var/log/cups/error_log
     #echo ")}] END cups logs from $CONTAINER_NAME"
 
     #echo "ipp/test: BEGIN cups logs from $CONTAINER_NAME [{("
-    #docker exec -t $CONTAINER_NAME cat //var/log/cups/page_log
+    #docker exec $CONTAINER_NAME cat //var/log/cups/page_log
     #echo ")}] END cups logs from $CONTAINER_NAME"
 done
diff --git a/integration_tests/postgres/setup.sh b/integration_tests/postgres/setup.sh
index 454414b5..7d21f44b 100755
--- a/integration_tests/postgres/setup.sh
+++ b/integration_tests/postgres/setup.sh
@@ -46,7 +46,7 @@ function waitFor() {
       fi
       sleep 1
     done
-    while ! (docker exec -t $CONTAINER_NAME cat //var/lib/postgresql/data/pg_log/postgres.log | grep -q "STARTED; state"); do
+    while ! (docker exec $CONTAINER_NAME cat //var/lib/postgresql/data/pg_log/postgres.log | grep -q "STARTED; state"); do
       echo -n "."
       sleep 1
     done
diff --git a/integration_tests/postgres/test.sh b/integration_tests/postgres/test.sh
index 1ee85406..102a5667 100755
--- a/integration_tests/postgres/test.sh
+++ b/integration_tests/postgres/test.sh
@@ -20,7 +20,7 @@ function doTest() {
   echo ")}] END DOCKER LOGS FROM $CONTAINER_NAME"
   echo "BEGIN POSTGRES LOGS FROM $CONTAINER_NAME [{("
   # TODO: The "//var/lib" is a work-around for MinGW
-  docker exec -t $CONTAINER_NAME cat //var/lib/postgresql/data/pg_log/postgres.log
+  docker exec $CONTAINER_NAME cat //var/lib/postgresql/data/pg_log/postgres.log
   echo ")}] END POSTGRES LOGS FROM $CONTAINER_NAME"
 }