Skip to content

Commit 473dae0

Browse files
committed
buildct 0.22.0->0.24.0 + simplify build
1 parent e17df7c commit 473dae0

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

.github/workflows/images.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ jobs:
4141
ghcr.io/yolean/ystack-runner:${{ github.sha }}
4242
platforms: linux/amd64,linux/arm64/v8
4343
push: true
44-
cache-from: |
45-
type=gha,scope=runner-latest
46-
type=gha,scope=runner
44+
cache-from: type=gha,scope=runner-latest
4745
cache-to: type=gha,mode=max,scope=runner-latest
4846
continue-on-error: false
4947
timeout-minutes: 45

bin/y-bin.runner.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ helm:
8282
path: ${os}-${arch}/helm
8383

8484
buildctl:
85-
version: 0.22.0
85+
version: 0.24.0
8686
templates:
8787
download: https://github.com/moby/buildkit/releases/download/v${version}/buildkit-v${version}.${os}-${arch}.tar.gz
8888
sha256:
89-
darwin_amd64: c21e32d75297c575596c43d7d28a4037551f2b0beaaa8cb7c1739303c45b8e62
90-
darwin_arm64: d3d7b5e7489573e6a742ca3f75799af07714542807e0034d59e69d3d63d1eff5
91-
linux_amd64: 2a159d4f3017a6e629306cfb7bbdb6610cb0215e124c2ded2c51df183d2c373b
92-
linux_arm64: c9b425a8f39f0c3fc58972b50d99ed4dde006e28d671a3de578085b15febb45a
89+
darwin_amd64: 505891a88557dc199c15a801c0417b7bd1caee066a21c8877430b81ce3fbc4ff
90+
darwin_arm64: 858c81ffee3b174fca9adf47b0ecf536f8a277653fa27256466d1508758ed103
91+
linux_amd64: af8064eca16077b4d6937745988ba2d2dfa439540874cdcd918318315f3ba1d3
92+
linux_arm64: 38dc4433d220bb43c198df2070e49d5dde5ed44ee31fb80d6b13722eec21d4ea
9393
archive:
9494
tool: tar
9595
#path: $(test 'linux' = $os && echo "bin/buildctl" || echo "buildctl")

runner.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ RUN set -ex; \
2424
ln -s /usr/local/src/ystack/bin/y-helm-${apt_helm_version}-bin /usr/local/src/ystack/bin/helm; \
2525
\
2626
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; \
2927
rm -rf /var/lib/apt/lists/*; \
3028
rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt /root/.gnupg
3129

0 commit comments

Comments
 (0)