From abc3513d62fea8d15d4f6e15997b2c44ba4d4307 Mon Sep 17 00:00:00 2001 From: Elina Akhmanova Date: Wed, 23 Nov 2022 09:45:30 +0000 Subject: [PATCH] Change e2e-test dockerfile To support multiarch, e2e-test dockerfile should have non-arch dependant packages. Signed-off-by: Elina Akhmanova --- Dockerfile.e2e-test | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Dockerfile.e2e-test b/Dockerfile.e2e-test index 2f730a432c..99f3e299da 100644 --- a/Dockerfile.e2e-test +++ b/Dockerfile.e2e-test @@ -15,9 +15,17 @@ 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 curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-206.0.0-linux-x86_64.tar.gz | tar -zxf - + +RUN apt-get update && apt-get install -y curl python \ + # Everything else than x86_64 or arm will not be supported + && if [ `uname -m` = 'x86_64' ]; then echo -n "x86_64" > /tmp/arch; else echo -n "arm" > /tmp/arch; fi; +RUN ARCH=`cat /tmp/arch` \ # ARCH is not equal to ARG_ARCH and needed only for cloudsdk download + && 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 ENTRYPOINT ["/run.sh"]