@@ -294,8 +294,8 @@ func TestExecUser(t *testing.T) {

 		container.WithTty(true),

 		container.WithUser("1:1"),

 	}

-	withoutEtcGroups := container.WithImage(build.Do(ctx, t, apiClient, fakecontext.New(t, "", fakecontext.WithDockerfile("FROM busybox\nRUN rm /etc/group"))))

-	withoutEtcPasswd := container.WithImage(build.Do(ctx, t, apiClient, fakecontext.New(t, "", fakecontext.WithDockerfile("FROM busybox\nRUN rm /etc/passwd"))))

+	withoutEtcGroups := container.WithImage(build.Do(ctx, t, apiClient, fakecontext.New(t, "", fakecontext.WithDockerfile("FROM busybox\nRUN rm /etc/group")), client.ImageBuildOptions{}))

+	withoutEtcPasswd := container.WithImage(build.Do(ctx, t, apiClient, fakecontext.New(t, "", fakecontext.WithDockerfile("FROM busybox\nRUN rm /etc/passwd")), client.ImageBuildOptions{}))

 	withUser := func(user string) func(options *client.ExecCreateOptions) {

 		return func(options *client.ExecCreateOptions) { options.User = user }

@@ -22,7 +22,7 @@ func TestAPIImagesHistory(t *testing.T) {

 	dockerfile := "FROM busybox\nENV FOO bar"

-	imgID := build.Do(ctx, t, apiClient, fakecontext.New(t, t.TempDir(), fakecontext.WithDockerfile(dockerfile)))

+	imgID := build.Do(ctx, t, apiClient, fakecontext.New(t, t.TempDir(), fakecontext.WithDockerfile(dockerfile)), client.ImageBuildOptions{})

 	res, err := apiClient.ImageHistory(ctx, imgID)

 	assert.NilError(t, err)

@@ -191,7 +191,7 @@ func TestAPIImagesDelete(t *testing.T) {

 ENV FOO=bar`))

 	defer buildCtx.Close()

-	imgID := build.Do(ctx, t, apiClient, buildCtx)

+	imgID := build.Do(ctx, t, apiClient, buildCtx, client.ImageBuildOptions{})

 	// Cleanup always runs

 	defer func() {

@@ -489,7 +489,7 @@ func TestSaveDirectoryPermissions(t *testing.T) {

 RUN adduser -D user && mkdir -p /opt/a/b && chown -R user:user /opt/a

 RUN touch /opt/a/b/c && chown user:user /opt/a/b/c`

-	imgID := build.Do(ctx, t, apiClient, fakecontext.New(t, t.TempDir(), fakecontext.WithDockerfile(dockerfile)))

+	imgID := build.Do(ctx, t, apiClient, fakecontext.New(t, t.TempDir(), fakecontext.WithDockerfile(dockerfile)), client.ImageBuildOptions{})

 	rdr, err := apiClient.ImageSave(ctx, []string{imgID})

 	assert.NilError(t, err)

@@ -17,9 +17,10 @@ import (

 	"gotest.tools/v3/assert"

 )

-// Do builds an image from the given context and returns the image ID.

-func Do(ctx context.Context, t *testing.T, apiClient client.APIClient, buildCtx *fakecontext.Fake) string {

-	resp, err := apiClient.ImageBuild(ctx, buildCtx.AsTarReader(t), client.ImageBuildOptions{})

+// Do builds an image from the given context with the supplied options

+// and returns the image ID.

+func Do(ctx context.Context, t *testing.T, apiClient client.APIClient, buildCtx *fakecontext.Fake, options client.ImageBuildOptions) string {

+	resp, err := apiClient.ImageBuild(ctx, buildCtx.AsTarReader(t), options)

 	assert.NilError(t, err)

 	if resp.Body != nil {

 		defer resp.Body.Close()

@@ -2272,7 +2272,7 @@ func TestPublishAllWithNilPortBindings(t *testing.T) {

 	c := testEnv.APIClient()

 	imgWithExpose := container.WithImage(build.Do(ctx, t, c,

-		fakecontext.New(t, "", fakecontext.WithDockerfile("FROM busybox\nEXPOSE 80/tcp\n"))))

+		fakecontext.New(t, "", fakecontext.WithDockerfile("FROM busybox\nEXPOSE 80/tcp\n")), client.ImageBuildOptions{}))

 	_ = container.Run(ctx, t, c,

 		container.WithAutoRemove,

@@ -338,7 +338,7 @@ func TestVolumePruneAnonFromImage(t *testing.T) {

 	dockerfile := `FROM busybox

 VOLUME ` + volDest

-	img := build.Do(ctx, t, apiClient, fakecontext.New(t, "", fakecontext.WithDockerfile(dockerfile)))

+	img := build.Do(ctx, t, apiClient, fakecontext.New(t, "", fakecontext.WithDockerfile(dockerfile)), client.ImageBuildOptions{})

 	id := container.Create(ctx, t, apiClient, container.WithImage(img))

 	defer apiClient.ContainerRemove(ctx, id, client.ContainerRemoveOptions{})