Skip to content

Commit c4c7c11

Browse files
committed
using docker-container buildx builder
1 parent e8e47c0 commit c4c7c11

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

.github/workflows/build-deps.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ jobs:
6767
-
6868
name: Setup QEMU
6969
uses: docker/setup-qemu-action@v3
70-
-
71-
name: Setup Docker Buildx
72-
uses: docker/setup-buildx-action@v3
73-
with:
74-
version: 'latest'
75-
driver-opts: 'image=moby/buildkit:buildx-stable-1'
76-
install: true
70+
# -
71+
# name: Setup Docker Buildx
72+
# uses: docker/setup-buildx-action@v3
73+
# with:
74+
# version: 'latest'
75+
# driver-opts: 'image=moby/buildkit:buildx-stable-1'
76+
# install: true
7777
-
7878
name: Login to DockerHub
7979
if: success() && env.PUSH_IMAGES == 'true'

build/build/Tasks/DockerBaseTask.cs

+2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ protected virtual DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage doc
5959
Rm = true,
6060
Tag = dockerTags,
6161
Platform = [$"linux/{suffix}"],
62+
Builder = "gittools",
6263
Output = ["type=docker,oci-mediatypes=true"],
6364
Pull = true,
6465
NoCache = true,
66+
Load = true,
6567
Label =
6668
[
6769
"maintainers=GitTools Maintainers",

build/build/Tasks/DockerBuildDeps.cs

+9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ public sealed class DockerBuildDeps : DockerBaseTask
88
{
99
public override void Run(BuildContext context)
1010
{
11+
context.DockerBuildXCreate(new DockerBuildXCreateSettings
12+
{
13+
Name = "gittools",
14+
Driver = "docker-container",
15+
DriverOpt = ["image=moby/buildkit:buildx-stable-1"],
16+
Use = true
17+
});
18+
context.DockerBuildXUse("gittools");
1119
// build/push images
1220
foreach (var dockerImage in context.DepsImages)
1321
{
@@ -23,6 +31,7 @@ public override void Run(BuildContext context)
2331
var dockerImage = group.First();
2432
DockerManifest(context, dockerImage);
2533
}
34+
context.DockerBuildXRm("gittools");
2635
}
2736

2837
protected override DirectoryPath GetWorkingDir(DockerDepsImage dockerImage) =>

0 commit comments

Comments
 (0)