Skip to content

Commit ef82d9c

Browse files
authored
Merge pull request #29 from infosiftr/busybox
Swap Ubuntu for BusyBox in our test suite
2 parents bfb2f84 + 2e8a15b commit ef82d9c

File tree

7 files changed

+1670
-60
lines changed

7 files changed

+1670
-60
lines changed

.test/builds.json

Lines changed: 813 additions & 20 deletions
Large diffs are not rendered by default.

.test/cache-builds.json

Lines changed: 284 additions & 0 deletions
Large diffs are not rendered by default.

.test/example-commands.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ SOURCE_DATE_EPOCH=1700741054 \
9393
docker push 'oisupport/staging-windows-amd64:9b405cfa5b88ba65121aabdb95ae90fd2e1fee7582174de82ae861613ae3072e'
9494
# </push>
9595

96-
# ubuntu:22.04 [amd64]
96+
# busybox:1.36.1 [amd64]
9797
# <pull>
9898

9999
# </pull>
@@ -103,11 +103,11 @@ gitCache="$BASHBREW_CACHE/git"
103103
git init --bare "$gitCache"
104104
_git() { git -C "$gitCache" "$@"; }
105105
_git config gc.auto 0
106-
_commit() { _git rev-parse 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490^{commit}'; }
107-
if ! _commit &> /dev/null; then _git fetch 'https://github.com/tianon/temp.git' 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490:' || _git fetch 'refs/tags/dist-jammy-amd64-20240111-e6e3490a:'; fi
106+
_commit() { _git rev-parse 'd0b7d566eb4f1fa9933984e6fc04ab11f08f4592^{commit}'; }
107+
if ! _commit &> /dev/null; then _git fetch 'https://github.com/docker-library/busybox.git' 'd0b7d566eb4f1fa9933984e6fc04ab11f08f4592:' || _git fetch 'refs/heads/dist-amd64:'; fi
108108
_commit
109109
mkdir temp
110-
_git archive --format=tar 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490:oci/' | tar -xvC temp
110+
_git archive --format=tar 'd0b7d566eb4f1fa9933984e6fc04ab11f08f4592:latest/glibc/amd64/' | tar -xvC temp
111111
jq -s '
112112
if length != 1 then
113113
error("unexpected '\''oci-layout'\'' document count: " + length)
@@ -134,12 +134,12 @@ jq -s '
134134
error("invalid descriptor size: " + .size)
135135
else . end
136136
| del(.annotations, .urls)
137-
| .annotations = {"org.opencontainers.image.source":"https://github.com/tianon/temp.git","org.opencontainers.image.revision":"e6e3490ad3f524ccaa072edafe525f8ca8ac5490","org.opencontainers.image.created":"2024-01-11T00:00:00Z","org.opencontainers.image.version":"22.04","org.opencontainers.image.url":"https://hub.docker.com/_/ubuntu","com.docker.official-images.bashbrew.arch":"amd64","org.opencontainers.image.base.name":"scratch"}
137+
| .annotations = {"org.opencontainers.image.source":"https://github.com/docker-library/busybox.git","org.opencontainers.image.revision":"d0b7d566eb4f1fa9933984e6fc04ab11f08f4592","org.opencontainers.image.created":"2024-02-28T00:44:18Z","org.opencontainers.image.version":"1.36.1","org.opencontainers.image.url":"https://hub.docker.com/_/busybox","com.docker.official-images.bashbrew.arch":"amd64","org.opencontainers.image.base.name":"scratch"}
138138
)
139139
' temp/index.json > temp/index.json.new
140140
mv temp/index.json.new temp/index.json
141141
# </build>
142142
# <push>
143-
crane push --index temp 'oisupport/staging-amd64:93476ae64659d71f4ee7fac781d6d1890df8926682e2fa6bd647a246b33ad9bf'
143+
crane push --index temp 'oisupport/staging-amd64:191402ad0feacf03daf9d52a492207e73ef08b0bd17265043aea13aa27e2bb3f'
144144
rm -rf temp
145145
# </push>

.test/library/busybox

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# this file is generated via https://github.com/docker-library/busybox/blob/a20bcbde28bc3ccb18d189b808d373d27caccbe4/generate-stackbrew-library.sh
2+
3+
Maintainers: Tianon Gravi <[email protected]> (@tianon),
4+
Joseph Ferguson <[email protected]> (@yosifkit)
5+
GitRepo: https://github.com/docker-library/busybox.git
6+
GitCommit: a20bcbde28bc3ccb18d189b808d373d27caccbe4
7+
Builder: oci-import
8+
File: index.json
9+
# https://github.com/docker-library/busybox/tree/dist-amd64
10+
amd64-GitFetch: refs/heads/dist-amd64
11+
amd64-GitCommit: d0b7d566eb4f1fa9933984e6fc04ab11f08f4592
12+
# https://github.com/docker-library/busybox/tree/dist-arm32v5
13+
arm32v5-GitFetch: refs/heads/dist-arm32v5
14+
arm32v5-GitCommit: 7044abc7ee26712d998311b402b975124786e0cf
15+
# https://github.com/docker-library/busybox/tree/dist-arm32v6
16+
arm32v6-GitFetch: refs/heads/dist-arm32v6
17+
arm32v6-GitCommit: c8b6d08f1f78467e7dd1ae3d5e4ec3563877e9a5
18+
# https://github.com/docker-library/busybox/tree/dist-arm32v7
19+
arm32v7-GitFetch: refs/heads/dist-arm32v7
20+
arm32v7-GitCommit: 185a3f7f21c307b15ef99b7088b228f004ff5f11
21+
# https://github.com/docker-library/busybox/tree/dist-arm64v8
22+
arm64v8-GitFetch: refs/heads/dist-arm64v8
23+
arm64v8-GitCommit: a8344687869ba9f95e140a62a915a30822ff2147
24+
# https://github.com/docker-library/busybox/tree/dist-i386
25+
i386-GitFetch: refs/heads/dist-i386
26+
i386-GitCommit: 64e761e756e3281bc9a49235ee200dfc1f5a525e
27+
# https://github.com/docker-library/busybox/tree/dist-mips64le
28+
mips64le-GitFetch: refs/heads/dist-mips64le
29+
mips64le-GitCommit: ea5639e7af6b21b81230ccaba4c05ccb2d80b9e3
30+
# https://github.com/docker-library/busybox/tree/dist-ppc64le
31+
ppc64le-GitFetch: refs/heads/dist-ppc64le
32+
ppc64le-GitCommit: 97dad737e59de0698f74b81a7dac4ce4d834e36c
33+
# https://github.com/docker-library/busybox/tree/dist-riscv64
34+
riscv64-GitFetch: refs/heads/dist-riscv64
35+
riscv64-GitCommit: 10a1d6f931c0fd84f31e5b3e464fed9773a9fdaa
36+
# https://github.com/docker-library/busybox/tree/dist-s390x
37+
s390x-GitFetch: refs/heads/dist-s390x
38+
s390x-GitCommit: ecf31f814875084a2bc85a162b78f512ea2df0c9
39+
40+
Tags: 1.36.1-glibc, 1.36-glibc, 1-glibc, stable-glibc, glibc
41+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
42+
amd64-Directory: latest/glibc/amd64
43+
arm32v5-Directory: latest/glibc/arm32v5
44+
arm32v7-Directory: latest/glibc/arm32v7
45+
arm64v8-Directory: latest/glibc/arm64v8
46+
i386-Directory: latest/glibc/i386
47+
mips64le-Directory: latest/glibc/mips64le
48+
ppc64le-Directory: latest/glibc/ppc64le
49+
riscv64-Directory: latest/glibc/riscv64
50+
s390x-Directory: latest/glibc/s390x
51+
52+
Tags: 1.36.1-uclibc, 1.36-uclibc, 1-uclibc, stable-uclibc, uclibc
53+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, riscv64
54+
amd64-Directory: latest/uclibc/amd64
55+
arm32v5-Directory: latest/uclibc/arm32v5
56+
arm32v7-Directory: latest/uclibc/arm32v7
57+
arm64v8-Directory: latest/uclibc/arm64v8
58+
i386-Directory: latest/uclibc/i386
59+
mips64le-Directory: latest/uclibc/mips64le
60+
riscv64-Directory: latest/uclibc/riscv64
61+
62+
Tags: 1.36.1-musl, 1.36-musl, 1-musl, stable-musl, musl
63+
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
64+
amd64-Directory: latest/musl/amd64
65+
arm32v6-Directory: latest/musl/arm32v6
66+
arm32v7-Directory: latest/musl/arm32v7
67+
arm64v8-Directory: latest/musl/arm64v8
68+
i386-Directory: latest/musl/i386
69+
ppc64le-Directory: latest/musl/ppc64le
70+
riscv64-Directory: latest/musl/riscv64
71+
s390x-Directory: latest/musl/s390x
72+
73+
Tags: 1.36.1, 1.36, 1, stable, latest
74+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x, riscv64, arm32v6
75+
amd64-Directory: latest/glibc/amd64
76+
arm32v5-Directory: latest/glibc/arm32v5
77+
arm32v7-Directory: latest/glibc/arm32v7
78+
arm64v8-Directory: latest/glibc/arm64v8
79+
i386-Directory: latest/glibc/i386
80+
mips64le-Directory: latest/glibc/mips64le
81+
ppc64le-Directory: latest/glibc/ppc64le
82+
s390x-Directory: latest/glibc/s390x
83+
riscv64-Directory: latest/uclibc/riscv64
84+
arm32v6-Directory: latest/musl/arm32v6
85+
86+
Tags: 1.35.0-glibc, 1.35-glibc
87+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
88+
amd64-Directory: latest-1/glibc/amd64
89+
arm32v5-Directory: latest-1/glibc/arm32v5
90+
arm32v7-Directory: latest-1/glibc/arm32v7
91+
arm64v8-Directory: latest-1/glibc/arm64v8
92+
i386-Directory: latest-1/glibc/i386
93+
mips64le-Directory: latest-1/glibc/mips64le
94+
ppc64le-Directory: latest-1/glibc/ppc64le
95+
riscv64-Directory: latest-1/glibc/riscv64
96+
s390x-Directory: latest-1/glibc/s390x
97+
98+
Tags: 1.35.0-uclibc, 1.35-uclibc
99+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, riscv64
100+
amd64-Directory: latest-1/uclibc/amd64
101+
arm32v5-Directory: latest-1/uclibc/arm32v5
102+
arm32v7-Directory: latest-1/uclibc/arm32v7
103+
arm64v8-Directory: latest-1/uclibc/arm64v8
104+
i386-Directory: latest-1/uclibc/i386
105+
mips64le-Directory: latest-1/uclibc/mips64le
106+
riscv64-Directory: latest-1/uclibc/riscv64
107+
108+
Tags: 1.35.0-musl, 1.35-musl
109+
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
110+
amd64-Directory: latest-1/musl/amd64
111+
arm32v6-Directory: latest-1/musl/arm32v6
112+
arm32v7-Directory: latest-1/musl/arm32v7
113+
arm64v8-Directory: latest-1/musl/arm64v8
114+
i386-Directory: latest-1/musl/i386
115+
ppc64le-Directory: latest-1/musl/ppc64le
116+
riscv64-Directory: latest-1/musl/riscv64
117+
s390x-Directory: latest-1/musl/s390x
118+
119+
Tags: 1.35.0, 1.35
120+
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x, riscv64, arm32v6
121+
amd64-Directory: latest-1/glibc/amd64
122+
arm32v5-Directory: latest-1/glibc/arm32v5
123+
arm32v7-Directory: latest-1/glibc/arm32v7
124+
arm64v8-Directory: latest-1/glibc/arm64v8
125+
i386-Directory: latest-1/glibc/i386
126+
mips64le-Directory: latest-1/glibc/mips64le
127+
ppc64le-Directory: latest-1/glibc/ppc64le
128+
s390x-Directory: latest-1/glibc/s390x
129+
riscv64-Directory: latest-1/uclibc/riscv64
130+
arm32v6-Directory: latest-1/musl/arm32v6

.test/library/ubuntu

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)