From 97280e559738998845f755a26e51e8dcc267cade Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 20 Mar 2025 21:30:33 +0000 Subject: [PATCH 1/3] Update dev image --- dev/image/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index d85944910e9f69..6e560f5eee82d0 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /tmp/helm/ \ && helm completion bash > /usr/share/bash-completion/completions/helm ### kubectl ### -RUN curl -fsSL -o /usr/bin/kubectl "https://dl.k8s.io/release/v1.28.9/bin/linux/amd64/kubectl" && chmod +x /usr/bin/kubectl \ +RUN curl -fsSL -o /usr/bin/kubectl "https://dl.k8s.io/release/v1.30.1/bin/linux/amd64/kubectl" && chmod +x /usr/bin/kubectl \ && kubectl completion bash > /usr/share/bash-completion/completions/kubectl RUN curl -fsSL -o /usr/bin/kubectx https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx && chmod +x /usr/bin/kubectx \ @@ -42,16 +42,16 @@ RUN install-packages mysql-client RUN cd /usr/bin && curl -fsSL https://github.com/cert-manager/cert-manager/releases/download/v1.13.0/cmctl-linux-amd64.tar.gz | tar xzv --no-anchored cmctl # gokart -RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/download/v0.4.0/gokart_0.4.0_linux_x86_64.tar.gz | tar xzv --no-anchored gokart +RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/download/v0.5.1/gokart_0.4.0_linux_x86_64.tar.gz | tar xzv --no-anchored gokart # leeway -ARG LEEWAY_VERSION=0.8.2 +ARG LEEWAY_VERSION=0.9.6 ENV LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE=8388608 ENV LEEWAY_WORKSPACE_ROOT=/workspace/gitpod ENV LEEWAY_REMOTE_CACHE_BUCKET=leeway-cache-dev-3ac8ef5 ENV LEEWAY_CACHE_DIR=/workspace/.leeway/cache ENV LEEWAY_BUILD_DIR=/workspace/.leeway/build -RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/download/v${LEEWAY_VERSION}/leeway_${LEEWAY_VERSION}_Linux_x86_64.tar.gz | tar xz +RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/download/v${LEEWAY_VERSION}/leeway_Linux_x86_64.tar.gz | tar xz # evans (gRPC client) RUN cd /usr/bin && curl -fsSL https://github.com/ktr0731/evans/releases/download/v0.10.6/evans_linux_amd64.tar.gz | tar xz evans @@ -103,8 +103,8 @@ RUN curl -fsSL -o /usr/bin/toxiproxy https://github.com/Shopify/toxiproxy/releas ### libseccomp > 2.5.2 RUN install-packages gperf \ && cd $(mktemp -d) \ - && curl -fsSL https://github.com/seccomp/libseccomp/releases/download/v2.5.4/libseccomp-2.5.4.tar.gz | tar xz \ - && cd libseccomp-2.5.4 && ./configure && make && make install + && curl -fsSL https://github.com/seccomp/libseccomp/releases/download/v2.6.0/libseccomp-2.6.0.tar.gz | tar xz \ + && cd libseccomp-2.6.0 && ./configure && make && make install ### Cypress deps RUN install-packages \ @@ -139,7 +139,7 @@ ARG GCS_DIR=/opt/google-cloud-sdk ENV PATH=$GCS_DIR/bin:$PATH RUN sudo chown gitpod: /opt \ && mkdir $GCS_DIR \ - && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-472.0.0-linux-x86_64.tar.gz \ + && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-515.0.0-linux-x86_64.tar.gz \ | tar -xzvC /opt \ && /opt/google-cloud-sdk/install.sh --quiet --usage-reporting=false --bash-completion=true \ --additional-components gke-gcloud-auth-plugin docker-credential-gcr alpha beta \ @@ -166,7 +166,7 @@ ENV DB_HOST=127.0.0.1 # awscliv2 # See also: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-version.html # See also: https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst -RUN curl -L "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.7.25.zip" -o "awscliv2.zip" \ +RUN curl -L "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \ && unzip awscliv2.zip \ && sudo ./aws/install \ && rm -f awscliv2.zip From 27925618075594aeacef242b80dadafde856ae4f Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 20 Mar 2025 21:31:50 +0000 Subject: [PATCH 2/3] Fix build --- dev/image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index 6e560f5eee82d0..9b1983c725e298 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -42,7 +42,7 @@ RUN install-packages mysql-client RUN cd /usr/bin && curl -fsSL https://github.com/cert-manager/cert-manager/releases/download/v1.13.0/cmctl-linux-amd64.tar.gz | tar xzv --no-anchored cmctl # gokart -RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/download/v0.5.1/gokart_0.4.0_linux_x86_64.tar.gz | tar xzv --no-anchored gokart +RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/download/v0.5.1/gokart_0.5.1_linux_x86_64.tar.gz | tar xzv --no-anchored gokart # leeway ARG LEEWAY_VERSION=0.9.6 From 88ea2833bced649a2e47240685141c0d62b384b7 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 20 Mar 2025 22:01:29 +0000 Subject: [PATCH 3/3] Do not update libseccomp --- dev/image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index 9b1983c725e298..e4d48c48c53646 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -103,8 +103,8 @@ RUN curl -fsSL -o /usr/bin/toxiproxy https://github.com/Shopify/toxiproxy/releas ### libseccomp > 2.5.2 RUN install-packages gperf \ && cd $(mktemp -d) \ - && curl -fsSL https://github.com/seccomp/libseccomp/releases/download/v2.6.0/libseccomp-2.6.0.tar.gz | tar xz \ - && cd libseccomp-2.6.0 && ./configure && make && make install + && curl -fsSL https://github.com/seccomp/libseccomp/releases/download/v2.5.4/libseccomp-2.5.4.tar.gz | tar xz \ + && cd libseccomp-2.5.4 && ./configure && make && make install ### Cypress deps RUN install-packages \