Merge branch 'master' into master

Author: sean-abbott

Dockerfile

@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
 
 RUN /tmp/fetch_binaries.sh
 
-FROM alpine:3.9
+FROM alpine:3.11
 
 RUN set -ex \
     && echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \
@@ -34,7 +34,7 @@ RUN set -ex \
     iperf \
     iproute2 \
     ipset \
-    iptables \
+    iptables \ 
     iptraf-ng \
     iputils \
     ipvsadm \
@@ -50,17 +50,16 @@ RUN set -ex \
     nmap-nping \
     openssl \
     py-crypto \
-    py2-virtualenv \
     scapy \
     socat \
     strace \
     tcpdump \
     tcptraceroute \
     tshark \
     util-linux \
-    vim 
-     
-    
+    vim \
+    websocat
+
 
 # apparmor issue #14140
 RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump

README.md

@@ -101,6 +101,7 @@ To troubleshoot these issues, `netshoot` includes a set of powerful tools as rec
     tshark
     util-linux
     vim
+    websocat
 
 ## **Docker EE 2.0 + Kubernetes Use Cases:** 
 Here's a list of use-cases that can help you understand when and how to use this container to solve networking issues in your Docker cluster. Please feel free to add your own use-case where you used `netshoot` to investigate, trouble-shoot, or just learn more about your environment!!!
@@ -669,4 +670,4 @@ More info on `termshark` [here](https://github.com/gcla/termshark)
 
 ## Feedback + Contribution
 
-Feel free to provide feedback and contribute networking troubleshooting tools and use-cases by opening PRs.
+Feel free to provide feedback and contribute networking troubleshooting tools and use-cases by opening PRs.