@@ -55,6 +55,7 @@ for tag in $tags; do
55
55
"tags": {{- json ($.Tags namespace false $e) -}},
56
56
"directory": {{- json ($e.ArchDirectory $arch) -}},
57
57
"file": {{- json ($e.ArchFile $arch) -}},
58
+ "builder": {{- json ($e.ArchBuilder $arch) -}}
58
59
"constraints": {{- json $e.Constraints -}},
59
60
"froms": {{- json ($.ArchDockerFroms $arch $e) -}}
60
61
{{- "}" -}}
@@ -77,7 +78,14 @@ for tag in $tags; do
77
78
runs: {
78
79
build: (
79
80
[
80
- "docker build"
81
+ # https://github.com/docker-library/bashbrew/pull/43
82
+ if .builder == "classic" or .builder == "" then
83
+ "DOCKER_BUILDKIT=0 docker build"
84
+ elif .builder == "buildkit" then
85
+ "docker buildx build --progress plain --build-arg BUILDKIT_SYNTAX=\"$BASHBREW_BUILDKIT_SYNTAX\"
86
+ else
87
+ "echo >&2 " + ("error: unknown/unsupported builder: " + .builder | @sh) + "\nexit 1\n#"
88
+ end
81
89
]
82
90
+ (
83
91
.tags
@@ -165,6 +173,7 @@ strategy="$(
165
173
end
166
174
),
167
175
"git clone --depth 1 https://github.com/docker-library/official-images.git -b master ~/oi",
176
+ "echo BASHBREW_BUILDKIT_SYNTAX=\"$(< ~/oi/.bashbrew-buildkit-syntax)\" >> \"$GITHUB_ENV\"",
168
177
"# create a dummy empty image/layer so we can --filter since= later to get a meaningful image list",
169
178
"{ echo FROM " + (
170
179
if .os | startswith("windows-") then
0 commit comments