From 06209cd4046a0b717358d93edf8fbfcb8b10d7a2 Mon Sep 17 00:00:00 2001 From: sophyc Date: Mon, 11 Mar 2024 20:24:50 +0100 Subject: [PATCH 1/2] Fix build issues --- containers/runtime/driver/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/runtime/driver/Dockerfile b/containers/runtime/driver/Dockerfile index 624e3381..c73ce79b 100644 --- a/containers/runtime/driver/Dockerfile +++ b/containers/runtime/driver/Dockerfile @@ -75,9 +75,9 @@ RUN apt-get update && apt-get install -y \ python3-setuptools \ python3-yaml -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-sdk -y +RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor | tee /usr/share/keyrings/cloud.google.gpg > /dev/null 2>&1 +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list +RUN apt-get update -y && apt-get install google-cloud-sdk -y RUN apt-get clean From f5b46a467dbfb4fa6141a83db2da687cfde614fe Mon Sep 17 00:00:00 2001 From: Sophy Cao Date: Mon, 18 Mar 2024 10:41:21 +0100 Subject: [PATCH 2/2] Update Dockerfile --- containers/runtime/driver/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/containers/runtime/driver/Dockerfile b/containers/runtime/driver/Dockerfile index c73ce79b..e4922482 100644 --- a/containers/runtime/driver/Dockerfile +++ b/containers/runtime/driver/Dockerfile @@ -75,9 +75,11 @@ RUN apt-get update && apt-get install -y \ python3-setuptools \ python3-yaml -RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor | tee /usr/share/keyrings/cloud.google.gpg > /dev/null 2>&1 -RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list -RUN apt-get update -y && apt-get install google-cloud-sdk -y +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://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 | \ + gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \ + apt-get update -y && apt-get install google-cloud-cli -y RUN apt-get clean