From 4b88d1a108386aa9761566e4463baf17d5375b7f Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Wed, 27 Apr 2022 20:12:39 +0000 Subject: [PATCH] update missed docker image pull Signed-off-by: Evan Baker --- hack/toolbox/manifests/Dockerfile.heavy | 31 ++++++++++++------------- hack/toolbox/server/Dockerfile.heavy | 31 +++++++++++-------------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/hack/toolbox/manifests/Dockerfile.heavy b/hack/toolbox/manifests/Dockerfile.heavy index 4facd58202..45cdd6a35b 100644 --- a/hack/toolbox/manifests/Dockerfile.heavy +++ b/hack/toolbox/manifests/Dockerfile.heavy @@ -1,30 +1,29 @@ FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04 RUN apt-get update RUN apt-get install -y \ - python3 \ - python \ - nmap \ - iptables \ + axel \ + bridge-utils \ + curl \ + dnsutils \ ebtables \ - sudo \ + emacs \ iproute2 \ - curl \ - wget \ - axel \ - jq \ - ssh \ - traceroute \ + iptables \ iputils-ping \ + jq \ + nano \ + ncat \ net-tools \ - dnsutils \ - bridge-utils \ netcat \ - ncat \ + nmap \ + python \ + python3 \ ssh \ + sudo \ tcpdump \ + traceroute \ vim \ - emacs \ - nano + wget RUN wget -qO- https://golang.org/dl/go1.14.6.linux-amd64.tar.gz | tar zxf - -C /usr/lib/ ENV PATH="/usr/lib/go/bin/:${PATH}" ENV GOROOT="/usr/lib/go" diff --git a/hack/toolbox/server/Dockerfile.heavy b/hack/toolbox/server/Dockerfile.heavy index 40084e22f7..79ebe9fb48 100644 --- a/hack/toolbox/server/Dockerfile.heavy +++ b/hack/toolbox/server/Dockerfile.heavy @@ -3,35 +3,32 @@ ADD ./ / WORKDIR / RUN CGO_ENABLED=0 GOOS=linux go build -o server . -FROM docker.io/alpine:latest -RUN apk update -RUN apk add \ +FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04 +RUN apt-get update +RUN apt-get install -y \ axel \ bridge-utils \ - bash \ curl \ - bind-tools \ + dnsutils \ ebtables \ - htop \ - iptables \ - ipset \ + emacs \ iproute2 \ - iperf3 \ - iftop \ + iptables \ + iputils-ping \ jq \ - lsof \ nano \ + ncat \ net-tools \ - netcat-openbsd \ + netcat \ nmap \ - nethogs \ + python \ + python3 \ + ssh \ sudo \ - openssh \ tcpdump \ - tcptraceroute \ - unzip \ + traceroute \ vim \ - wget + wget RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" RUN curl -LO "https://dl.k8s.io/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl.sha256"