Skip to content

Commit 66b078d

Browse files
committed
fix: drop alpine for md5sum step
Use [StageX](https://stagex.tools/) instead. Fixes #182 Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 24a37b0 commit 66b078d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

internal/pkg/constants/build.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@ const VarsYaml = "vars.yaml"
2424

2525
// Pkgfile is the filename of 'Pkgfile'.
2626
const Pkgfile = "Pkgfile"
27+
28+
// StageXBusyboxImage is the image name for busybox from stageX.
29+
// renovate: datasource=docker versioning=docker depName=siderolabs/stagex/core-busybox
30+
const StageXBusyboxImage = "ghcr.io/siderolabs/stagex/core-busybox:1.36.1@sha256:c0b551b47d8f1ac2fd5f4712eafddb8717e6e563a47203e02f94f944f64c18b2"

internal/pkg/convert/graph.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,9 @@ func (graph *GraphLLB) buildBaseImages() {
108108

109109
func (graph *GraphLLB) buildChecksummer() {
110110
graph.Checksummer = llb.Image(
111-
constants.DefaultBaseImage,
111+
constants.StageXBusyboxImage,
112112
llb.WithCustomName(graph.Options.CommonPrefix+"cksum"),
113-
).Run(
114-
append(graph.commonRunOptions,
115-
llb.Shlex("apk --no-cache --update add coreutils"),
116-
llb.WithCustomName(graph.Options.CommonPrefix+"cksum-apkinstall"),
117-
)...,
118-
).Root()
113+
)
119114
}
120115

121116
func (graph *GraphLLB) buildLocalContext() {

internal/pkg/convert/node.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ func (node *NodeLLB) stepDownload(root llb.State, step v1alpha2.Step) llb.State
230230
llb.WithCustomName(node.Prefix+"cksum-prepare"),
231231
).Run(
232232
append(node.Graph.commonRunOptions,
233-
llb.Shlex("sha512sum -c --strict /checksums"),
233+
llb.Shlex("sha512sum -c -w /checksums"),
234234
llb.WithCustomName(node.Prefix+"cksum-verify"),
235+
llb.Network(pb.NetMode_NONE),
235236
)...,
236237
).Root()
237238

0 commit comments

Comments
 (0)