From 89aa68704d8a6860aedd28c32e7ac513bc40055b Mon Sep 17 00:00:00 2001 From: Alex Suraci Date: Thu, 22 Oct 2020 11:59:37 -0400 Subject: [PATCH] consistently install bash + wget alpine had wget but no bash ubuntu had bash but no wget let's have both, since bash is handy for 'fly intercept' and wget is used in k8s-topgun (which currently uses busybox, but now could be switched to use mock) Signed-off-by: Alex Suraci --- dockerfiles/alpine/Dockerfile | 1 + dockerfiles/ubuntu/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile index 636d935..52c3675 100644 --- a/dockerfiles/alpine/Dockerfile +++ b/dockerfiles/alpine/Dockerfile @@ -10,3 +10,4 @@ RUN go build -o /assets/check ./cmd/check FROM alpine:edge COPY --from=builder assets/ /opt/resource/ RUN chmod +x /opt/resource/* +RUN apk --no-cache add bash wget diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile index e78ddf5..31d1f9c 100644 --- a/dockerfiles/ubuntu/Dockerfile +++ b/dockerfiles/ubuntu/Dockerfile @@ -10,3 +10,4 @@ RUN go build -o /assets/check ./cmd/check FROM ubuntu:bionic AS resource COPY --from=builder assets/ /opt/resource/ RUN chmod +x /opt/resource/* +RUN apt-get update && apt-get -y -u install wget