Replace deprecated netstat with ss

Signed-off-by: Tom Fenech <[email protected]>
concourse · May 25, 2023 · bef9d2f · bef9d2f
1 parent c711a39
commit bef9d2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile
@@ -198,7 +198,7 @@ ADD test/ /tests
 RUN /tests/all.sh
 
 FROM resource AS integrationtests
-RUN apk --no-cache add squid
+RUN apk --no-cache add iproute2-ss squid
 ADD test/ /tests/test
 ADD integration-tests /tests/integration-tests
 RUN /tests/integration-tests/integration.sh

diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
@@ -190,7 +190,7 @@ ADD test/ /tests
 RUN /tests/all.sh
 
 FROM resource AS integrationtests
-RUN apt update && apt install -y net-tools squid
+RUN apt update && apt install -y iproute2 squid
 ADD test/ /tests/test
 ADD integration-tests /tests/integration-tests
 RUN /tests/integration-tests/integration.sh

diff --git a/integration-tests/helpers.sh b/integration-tests/helpers.sh
@@ -139,10 +139,7 @@ __run() {
   set +e
   attempts=10
   while (( attempts )); do
-    ( netstat -an | grep LISTEN | grep 3128 ) >/dev/null 2>&1
-    rc=$?
-
-    if [[ $rc == 0 ]]; then
+    if ss -ltn | grep -q 3128; then
       break
     else
       echo "Waiting for proxy to finish reconfiguring..."