Skip to content

Commit 2f48f16

Browse files
committed
testutil: pin busybox and alpine used in releases
Signed-off-by: Tonis Tiigi <[email protected]>
1 parent f335be0 commit 2f48f16

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

util/testutil/integration/pins.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package integration
2+
3+
var pins = map[string]map[string]string{
4+
// busybox is pinned to 1.35. Newer produces has "illegal instruction" panic on some of Github infra on sha256sum
5+
"busybox:latest": {
6+
"amd64": "sha256:0d5a701f0ca53f38723108687add000e1922f812d4187dea7feaee85d2f5a6c5",
7+
"arm64v8": "sha256:ffe38d75e44d8ffac4cd6d09777ffc31e94ea0ded6a0164e825a325dc17a3b68",
8+
"library": "sha256:f4ed5f2163110c26d42741fdc92bd1710e118aed4edb19212548e8ca4e5fca22",
9+
},
10+
"alpine:latest": {
11+
"amd64": "sha256:c0d488a800e4127c334ad20d61d7bc21b4097540327217dfab52262adc02380c",
12+
"arm64v8": "sha256:af06af3514c44a964d3b905b498cf6493db8f1cde7c10e078213a89c87308ba0",
13+
"library": "sha256:8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4",
14+
},
15+
}

util/testutil/integration/run.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,18 @@ func OfficialImages(names ...string) map[string]string {
264264
ns := runtime.GOARCH
265265
if ns == "arm64" {
266266
ns = "arm64v8"
267-
} else if ns != "amd64" && ns != "armhf" {
267+
} else if ns != "amd64" {
268268
ns = "library"
269269
}
270270
m := map[string]string{}
271271
for _, name := range names {
272-
m["library/"+name] = "docker.io/" + ns + "/" + name
272+
ref := "docker.io/" + ns + "/" + name
273+
if pns, ok := pins[name]; ok {
274+
if dgst, ok := pns[ns]; ok {
275+
ref += "@" + dgst
276+
}
277+
}
278+
m["library/"+name] = ref
273279
}
274280
return m
275281
}

0 commit comments

Comments
 (0)