From 981abdbc85a02fb8f8ad5d12fc0094c0a6f5394b Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 28 Feb 2020 17:17:05 +0200
Subject: [PATCH] tester: Update Helm binaries and bash

---
 Dockerfile.loadtester | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.loadtester b/Dockerfile.loadtester
index e2e6c558..1ad4fb1c 100644
--- a/Dockerfile.loadtester
+++ b/Dockerfile.loadtester
@@ -1,16 +1,16 @@
-FROM alpine:3.10.3 as build
+FROM alpine:3.11 as build
 
 RUN apk --no-cache add alpine-sdk perl curl
 
 RUN curl -sSLo hey "https://storage.googleapis.com/hey-release/hey_linux_amd64" && \
 chmod +x hey && mv hey /usr/local/bin/hey
 
-RUN HELM2_VERSION=2.16.1 && \
+RUN HELM2_VERSION=2.16.3 && \
 curl -sSL "https://get.helm.sh/helm-v${HELM2_VERSION}-linux-amd64.tar.gz" | tar xvz && \
 chmod +x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helm && \
 chmod +x linux-amd64/tiller && mv linux-amd64/tiller /usr/local/bin/tiller
 
-RUN HELM3_VERSION=3.0.1 && \
+RUN HELM3_VERSION=3.1.1 && \
 curl -sSL "https://get.helm.sh/helm-v${HELM3_VERSION}-linux-amd64.tar.gz" | tar xvz && \
 chmod +x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helmv3
 
@@ -30,7 +30,7 @@ RUN WRK_VERSION=4.0.2 && \
 cd /tmp && git clone -b ${WRK_VERSION} https://github.com/wg/wrk
 RUN cd /tmp/wrk && make
 
-FROM bats/bats:v1.1.0
+FROM bash:5.0
 
 RUN addgroup -S app && \
 adduser -S -g app app && \
@@ -38,6 +38,9 @@ apk --no-cache add ca-certificates curl jq libgcc
 
 WORKDIR /home/app
 
+COPY --from=bats/bats:v1.1.0 /opt/bats/ /opt/bats/
+RUN ln -s /opt/bats/bin/bats /usr/local/bin/
+
 COPY --from=build /usr/local/bin/hey /usr/local/bin/
 COPY --from=build /tmp/wrk/wrk /usr/local/bin/
 COPY --from=build /usr/local/bin/helm /usr/local/bin/
@@ -46,6 +49,7 @@ COPY --from=build /usr/local/bin/ghz /usr/local/bin/
 COPY --from=build /usr/local/bin/helmv3 /usr/local/bin/
 COPY --from=build /usr/local/bin/grpc_health_probe /usr/local/bin/
 COPY --from=build /tmp/helm-tiller /tmp/helm-tiller
+
 ADD https://raw.githubusercontent.com/grpc/grpc-proto/master/grpc/health/v1/health.proto /tmp/ghz/health.proto
 
 COPY ./bin/loadtester .