From 0399e89376113da71b8bebf0f89bd60e1c245274 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Thu, 20 Mar 2025 21:13:42 +0000
Subject: [PATCH 1/2] Update runc to v1.2.6 and gcloud to v515.0.0
---
components/ws-daemon/leeway.Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/ws-daemon/leeway.Dockerfile b/components/ws-daemon/leeway.Dockerfile
index fb3f3a846cd0a7..6a1450d516ef81 100644
--- a/components/ws-daemon/leeway.Dockerfile
+++ b/components/ws-daemon/leeway.Dockerfile
@@ -5,7 +5,7 @@
FROM cgr.dev/chainguard/wolfi-base:latest@sha256:79884062be1fd5f698859ee4044c6d13729fabeb9eb1f34aacfc6120414f8a91 as dl
WORKDIR /dl
RUN apk add --no-cache curl file \
- && curl -OsSL https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64 \
+ && curl -OsSL https://github.com/opencontainers/runc/releases/download/v1.2.6/runc.amd64 \
&& chmod +x runc.amd64 \
&& if ! file runc.amd64 | grep -iq "ELF 64-bit LSB pie executable"; then echo "runc.amd64 is not a binary file"; exit 1;fi
@@ -15,7 +15,7 @@ FROM ubuntu:22.04
ENV TRIGGER_REBUILD=1
## Installing coreutils is super important here as otherwise the loopback device creation fails!
-ARG CLOUD_SDK_VERSION=467.0.0
+ARG CLOUD_SDK_VERSION=515.0.0
ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
ENV CLOUDSDK_CORE_DISABLE_PROMPTS=1
From b6f32aa9aae67b60472d8076c0fb4e8acf0510e2 Mon Sep 17 00:00:00 2001
From: Christian Weichel <chris@gitpod.io>
Date: Fri, 21 Mar 2025 07:59:54 +0000
Subject: [PATCH 2/2] Use correct package name
---
components/ws-daemon/leeway.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/ws-daemon/leeway.Dockerfile b/components/ws-daemon/leeway.Dockerfile
index 6a1450d516ef81..bc955c8a9f37c0 100644
--- a/components/ws-daemon/leeway.Dockerfile
+++ b/components/ws-daemon/leeway.Dockerfile
@@ -34,7 +34,7 @@ RUN apt update \
nfs-common \
&& 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 -sSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
- && apt update && apt install -y --no-install-recommends google-cloud-sdk=${CLOUD_SDK_VERSION}-0 \
+ && apt update && apt install -y --no-install-recommends google-cloud-cli=${CLOUD_SDK_VERSION}-0 \
&& gcloud config set core/disable_usage_reporting true \
&& gcloud config set component_manager/disable_update_check true \
&& gcloud config set metrics/environment github_docker_image \