From a52937948375d0e1d957fb868492c90b9289a91a Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sat, 7 Dec 2024 16:43:49 +0100 Subject: [PATCH] Is the get.helm.sh from github actions SSL problem solved yet? Revert "Workaround for SSL error with curl get.helm.sh in github actions" This reverts commit 8e502e543553f03be60b0c75ac56005b60ee9ed1. --- runner.Dockerfile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/runner.Dockerfile b/runner.Dockerfile index d17951c..4f519ef 100644 --- a/runner.Dockerfile +++ b/runner.Dockerfile @@ -9,7 +9,7 @@ RUN set -ex; \ ); \ \ export DEBIAN_FRONTEND=noninteractive; \ - runDeps='ca-certificates curl git jq unzip findutils patch xz-utils gpg apt-transport-https'; \ + runDeps='ca-certificates curl git jq unzip findutils patch xz-utils'; \ buildDeps=''; \ apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends; \ \ @@ -43,15 +43,7 @@ COPY bin/y-kustomize /usr/local/src/ystack/bin/ RUN y-kustomize version COPY bin/y-helm /usr/local/src/ystack/bin/ -# RUN y-helm version --client=true -RUN curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list \ - && apt-get update \ - && apt-get install helm \ - && helm version --client=true \ - && ln -s $(which helm) /usr/local/src/ystack/bin/helm \ - && ln -s $(which helm) /usr/local/src/ystack/bin/y-helm-v3.16.2-bin \ - && y-helm version --client=true +RUN y-helm version --client=true COPY bin/y-buildctl /usr/local/src/ystack/bin/ RUN y-buildctl --version