Skip to content

Commit e17df7c

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 See #63 for history about this workaround
1 parent 72be7ac commit e17df7c

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

bin/y-bin.runner.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ skaffold:
6868
linux_arm64: 518e6397c79f540c4250d9050748bc59de077b8674d0d1df6bc42db4625e0fe6
6969

7070
helm:
71-
version: 3.18.4
71+
version: 3.18.6
7272
templates:
7373
download: https://get.helm.sh/helm-v${version}-${os}-${arch}.tar.gz
7474
sha256: https://get.helm.sh/helm-v${version}-${os}-${arch}.tar.gz.sha256sum
7575
sha256:
76-
darwin_amd64: 860a7238285b44b5dc7b3c4dad6194316885d7015d77c34e23177e0e9554af8f
77-
darwin_arm64: 041849741550b20710d7ad0956e805ebd960b483fe978864f8e7fdd03ca84ec8
78-
linux_amd64: f8180838c23d7c7d797b208861fecb591d9ce1690d8704ed1e4cb8e2add966c1
79-
linux_arm64: c0a45e67eef0c7416a8a8c9e9d5d2d30d70e4f4d3f7bea5de28241fffa8f3b89
76+
darwin_amd64: 80cad0470e38cf25731cdead7c32dfbeb887bc177bd6fa01e31b065722f8f06b
77+
darwin_arm64: 48e30d236a1f334c6acb78501be5a851eaa2a267fefeb1131b6484eb2f9f30d7
78+
linux_amd64: 3f43c0aa57243852dd542493a0f54f1396c0bc8ec7296bbb2c01e802010819ce
79+
linux_arm64: 5b8e00b6709caab466cbbb0bc29ee09059b8dc9417991dd04b497530e49b1737
8080
archive:
8181
tool: tar
8282
path: ${os}-${arch}/helm

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)