From 9dbf55097a8cfa09e6ac1029d74a7e9c3c80423b Mon Sep 17 00:00:00 2001 From: Flavio Crisciani Date: Wed, 20 Jun 2018 12:57:08 -0700 Subject: [PATCH] Create support as a container Containerize support.sh Signed-off-by: Flavio Crisciani --- libnetwork/Makefile | 2 ++ libnetwork/support/Dockerfile | 49 +++++++++++++++++++++++++++++ libnetwork/support/README | 1 + libnetwork/{ => support}/support.sh | 0 4 files changed, 52 insertions(+) create mode 100644 libnetwork/support/Dockerfile create mode 100644 libnetwork/support/README rename libnetwork/{ => support}/support.sh (100%) diff --git a/libnetwork/Makefile b/libnetwork/Makefile index c35b55a6c3..beeea1293a 100644 --- a/libnetwork/Makefile +++ b/libnetwork/Makefile @@ -34,12 +34,14 @@ build-images: docker build -f cmd/diagnostic/Dockerfile.client -t dockereng/network-diagnostic:onlyclient bin/ docker build -f cmd/diagnostic/Dockerfile.dind -t dockereng/network-diagnostic:17.12-dind bin/ docker build -f cmd/networkdb-test/Dockerfile -t dockereng/e2e-networkdb bin/ + docker build -t dockereng/network-diagnostic:support.sh support/ push-images: build-images @echo "🐳 $@" docker push dockereng/network-diagnostic:onlyclient docker push dockereng/network-diagnostic:17.12-dind docker push dockereng/e2e-networkdb + docker push dockereng/network-diagnostic:support.sh clean: @echo "🐳 $@" diff --git a/libnetwork/support/Dockerfile b/libnetwork/support/Dockerfile new file mode 100644 index 0000000000..79b67306fc --- /dev/null +++ b/libnetwork/support/Dockerfile @@ -0,0 +1,49 @@ +FROM docker:18-dind + +RUN set -ex \ + && echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \ + && echo "http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ + && apk update \ + && apk add --no-cache \ + tcpdump \ + bridge-utils \ + netcat-openbsd \ + util-linux \ + iptables \ + iputils \ + iproute2 \ + iftop \ + drill \ + apache2-utils \ + strace \ + curl \ + ethtool \ + ipvsadm \ + ngrep \ + iperf \ + nmap \ + nmap-nping \ + conntrack-tools \ + socat \ + busybox-extras \ + tcptraceroute \ + mtr \ + fping \ + liboping \ + iptraf-ng \ + dhcping \ + nmap-nping \ + net-snmp-tools \ + python2 \ + py2-virtualenv \ + py-crypto \ + scapy \ + vim \ + bird \ + bash \ + bind-tools + +WORKDIR /bin +COPY support.sh . + +CMD /bin/support.sh diff --git a/libnetwork/support/README b/libnetwork/support/README new file mode 100644 index 0000000000..225df3a8b8 --- /dev/null +++ b/libnetwork/support/README @@ -0,0 +1 @@ +Usage: docker run -v /var/run:/var/run --network host --privileged dockereng/network-diagnostic:support.sh diff --git a/libnetwork/support.sh b/libnetwork/support/support.sh similarity index 100% rename from libnetwork/support.sh rename to libnetwork/support/support.sh