diff --git a/bin/y-bin.runner.yaml b/bin/y-bin.runner.yaml index 3c2b4cd..082b388 100755 --- a/bin/y-bin.runner.yaml +++ b/bin/y-bin.runner.yaml @@ -68,15 +68,15 @@ skaffold: linux_arm64: df3ca1d83a4be9b7f4795de4470c8274a8420563d2d0d40fbcafbc92bd1b6c8e helm: - version: 3.16.1 + version: 3.16.2 templates: download: https://get.helm.sh/helm-v${version}-${os}-${arch}.tar.gz sha256: https://get.helm.sh/helm-v${version}-${os}-${arch}.tar.gz.sha256sum sha256: - darwin_amd64: 1b194824e36da3e3889920960a93868b541c7888c905a06757e88666cfb562c9 - darwin_arm64: 405a3b13f0e194180f7b84010dfe86689d7703e80612729882ad71e2a4ef3504 - linux_amd64: e57e826410269d72be3113333dbfaac0d8dfdd1b0cc4e9cb08bdf97722731ca9 - linux_arm64: 780b5b86f0db5546769b3e9f0204713bbdd2f6696dfdaac122fbe7f2f31541d2 + darwin_amd64: 33efd48492f2358a49a231873e8baf41f702b5ab059333ae9c31e5517633c16e + darwin_arm64: 56413c7fbb496d2789881039cab61d849727c7b35db00826fae7a2685a403344 + linux_amd64: 9318379b847e333460d33d291d4c088156299a26cd93d570a7f5d0c36e50b5bb + linux_arm64: 1888301aeb7d08a03b6d9f4d2b73dcd09b89c41577e80e3455c113629fc657a4 archive: tool: tar path: ${os}-${arch}/helm diff --git a/runner.Dockerfile b/runner.Dockerfile index f539075..1de7e2d 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'; \ + runDeps='ca-certificates curl git jq unzip findutils patch xz-utils gpg apt-transport-https'; \ buildDeps=''; \ apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends; \ \ @@ -43,7 +43,15 @@ 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 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 COPY bin/y-buildctl /usr/local/src/ystack/bin/ RUN y-buildctl --version