Skip to content

Commit 2dbf52e

Browse files
committed
helm changed their debian/ubuntu package instructions
also remove the package source afterwards to not affect any package installation steps in downstream image builds
1 parent 72be7ac commit 2dbf52e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

runner.Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ RUN set -ex; \
1515
apt-get install -y $runDeps $buildDeps --no-install-recommends; \
1616
\
1717
echo "workaround for y-helm failing in github actions due to get.helm.sh SSL error"; \
18-
curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null; \
19-
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; \
20-
apt-get update && apt-get install -y helm --no-install-recommends; \
18+
curl -fsSL https://packages.buildkite.com/helm-linux/helm-debian/gpgkey | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null; \
19+
echo "deb [signed-by=/usr/share/keyrings/helm.gpg] https://packages.buildkite.com/helm-linux/helm-debian/any/ any main" | tee /etc/apt/sources.list.d/helm-stable-debian.list; \
20+
apt-get update -o APT::Update::Error-Mode=any; \
21+
apt-get install -y helm --no-install-recommends; \
2122
apt_helm_version=$(/usr/bin/helm version --template '{{.Version}}'); \
2223
mkdir -p /usr/local/src/ystack/bin && cp -av /usr/bin/helm /usr/local/src/ystack/bin/y-helm-${apt_helm_version}-bin; \
2324
ln -s /usr/local/src/ystack/bin/y-helm-${apt_helm_version}-bin /usr/local/src/ystack/bin/helm; \
2425
\
2526
apt-get purge -y --auto-remove $buildDeps helm; \
27+
rm /etc/apt/sources.list.d/helm-stable-debian.list; \
28+
apt-get update -o APT::Update::Error-Mode=any; \
2629
rm -rf /var/lib/apt/lists/*; \
2730
rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt /root/.gnupg
2831

0 commit comments

Comments
 (0)