From a3d549c5a6f2234c0e8ed28605632cad339dd855 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 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile.e2e-test b/Dockerfile.e2e-test index 2f730a432c..5d7e9ee11a 100644 --- a/Dockerfile.e2e-test +++ b/Dockerfile.e2e-test @@ -12,12 +12,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:9 +FROM debian:11 ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN +ARG CLOUD_SDK_VERSION="412.0.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 - + +# gcloud-cli installation. See recommended instructions: +# cloud.google.com/sdk/docs/install#installation_instructions +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] \ + http://packages.cloud.google.com/apt cloud-sdk main" | \ + tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ + curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ + apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \ + apt-get update -y && apt-get install google-cloud-cli=$CLOUD_SDK_VERSION -y + +RUN apt-get install -y curl python ENTRYPOINT ["/run.sh"]