Change e2e-test dockerfile

To support multiarch, e2e-test dockerfile
should have non-arch dependant packages.

Signed-off-by: Elina Akhmanova <elinka@google.com>

Dockerfile.e2e-test

@@ -15,17 +15,16 @@
 FROM debian:9
 
 ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN
+ARG CLOUD_SDK_VERSION=412.0.0
+ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 
 COPY cmd/e2e-test/run.sh /run.sh
-RUN apt-get update && apt-get install -y curl python
-RUN echo "Installing gcloud SDK, kubectl ..." \
-    && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz --output google-cloud-sdk.tar.gz \
+RUN apt-get update && apt-get install -y curl python \
+    && if [ `uname -m` = 'x86_64' ]; then echo -n "x86_64" > /tmp/arch; else echo -n "arm" > /tmp/arch; fi;
+
+RUN ARCH=`cat /tmp/arch` \
+    && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz --output google-cloud-sdk.tar.gz \
     && tar xzf google-cloud-sdk.tar.gz -C / \
-    && rm google-cloud-sdk.tar.gz \
-    && /google-cloud-sdk/install.sh \
-        --disable-installation-options \
-        --bash-completion=false \
-        --path-update=false \
-        --usage-reporting=false
+    && rm google-cloud-sdk.tar.gz
 
 ENTRYPOINT ["/run.sh"]