Skip to content

Commit

Permalink
build: fix "the input device is not a TTY"
Browse files Browse the repository at this point in the history
  • Loading branch information
developStorm committed May 20, 2024
1 parent 66d66c4 commit 3f4a9c5
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docker-runner/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
2 changes: 1 addition & 1 deletion integration_tests/ftp/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 [{("
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/http/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions integration_tests/ipp/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion integration_tests/postgres/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/postgres/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down

0 comments on commit 3f4a9c5

Please sign in to comment.