From 49f683f4c7dec73a699219a65da83fc500563360 Mon Sep 17 00:00:00 2001 From: Juan Font Date: Sat, 30 Jul 2022 22:34:59 +0000 Subject: [PATCH 1/3] Add support for BuildKit when building images --- docker/image.go | 1 + dockertest.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docker/image.go b/docker/image.go index 1d550291..c1d9a7d4 100644 --- a/docker/image.go +++ b/docker/image.go @@ -480,6 +480,7 @@ type BuildImageOptions struct { SecurityOpt []string `qs:"securityopt"` Target string `gs:"target"` Platform string `qs:"platform"` + Version string `qs:"version"` Context context.Context } diff --git a/dockertest.go b/dockertest.go index 40857350..636978bf 100644 --- a/dockertest.go +++ b/dockertest.go @@ -328,6 +328,8 @@ type BuildOptions struct { ContextDir string BuildArgs []dc.BuildArg Platform string + // Version specifies the builder to use. "1" for classic, "2" for BuildKit + Version string } // BuildAndRunWithBuildOptions builds and starts a docker container. @@ -340,6 +342,7 @@ func (d *Pool) BuildAndRunWithBuildOptions(buildOpts *BuildOptions, runOpts *Run ContextDir: buildOpts.ContextDir, BuildArgs: buildOpts.BuildArgs, Platform: buildOpts.Platform, + Version: buildOpts.Version, }) if err != nil { From 01dd6604e87c174859e90de60344058fca8a2ddd Mon Sep 17 00:00:00 2001 From: hackerman <3372410+aeneasr@users.noreply.github.com> Date: Tue, 22 Oct 2024 09:36:05 +0200 Subject: [PATCH 2/3] Update dockertest.go --- dockertest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockertest.go b/dockertest.go index 8914e614..3394109a 100644 --- a/dockertest.go +++ b/dockertest.go @@ -331,9 +331,9 @@ type BuildOptions struct { ContextDir string BuildArgs []dc.BuildArg Platform string + Auth dc.AuthConfigurations // Version specifies the builder to use. "1" for classic, "2" for BuildKit Version string - Auth dc.AuthConfigurations } // BuildAndRunWithBuildOptions builds and starts a docker container. From 1e4a17a4b4c490b49eac8fb026ac425d0f03c4e2 Mon Sep 17 00:00:00 2001 From: hackerman <3372410+aeneasr@users.noreply.github.com> Date: Tue, 22 Oct 2024 09:37:19 +0200 Subject: [PATCH 3/3] Update dockertest.go --- dockertest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockertest.go b/dockertest.go index 3394109a..89cfb23c 100644 --- a/dockertest.go +++ b/dockertest.go @@ -331,7 +331,7 @@ type BuildOptions struct { ContextDir string BuildArgs []dc.BuildArg Platform string - Auth dc.AuthConfigurations + Auth dc.AuthConfigurations // Version specifies the builder to use. "1" for classic, "2" for BuildKit Version string }