Skip to content

Commit 139f4ad

Browse files
committed
Replace deprecated netstat with ss
Signed-off-by: Tom Fenech <tomjwfenech@gmail.com>
1 parent 605e922 commit 139f4ad

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ ADD test/ /tests
191191
RUN /tests/all.sh
192192

193193
FROM resource AS integrationtests
194-
RUN apt update && apt install -y net-tools squid
194+
RUN apt update && apt install -y iproute2 squid
195195
ADD test/ /tests/test
196196
ADD integration-tests /tests/integration-tests
197197
RUN /tests/integration-tests/integration.sh

integration-tests/helpers.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,7 @@ __run() {
139139
set +e
140140
attempts=10
141141
while (( attempts )); do
142-
( netstat -an | grep LISTEN | grep 3128 ) >/dev/null 2>&1
143-
rc=$?
144-
145-
if [[ $rc == 0 ]]; then
142+
if ss -ltn | grep -q 3128; then
146143
break
147144
else
148145
echo "Waiting for proxy to finish reconfiguring..."

0 commit comments

Comments
 (0)