Merge pull request #22 from thediveo/develop

feat: buildkit support

Author: thediveo

README.md

@@ -7,7 +7,7 @@
 ![build and test](https://github.com/thediveo/morbyd/actions/workflows/buildandtest.yaml/badge.svg?branch=master)
 ![goroutines](https://img.shields.io/badge/go%20routines-not%20leaking-success)
 [![Go Report Card](https://goreportcard.com/badge/github.com/thediveo/morbyd)](https://goreportcard.com/report/github.com/thediveo/morbyd)
-![Coverage](https://img.shields.io/badge/Coverage-98.2%25-brightgreen)
+![Coverage](https://img.shields.io/badge/Coverage-97.8%25-brightgreen)
 
 `morbyd` is a thin layer on top of the standard Docker Go client to easily build
 and run throw-away test Docker images and containers. And to easily run commands

build/options.go

@@ -161,6 +161,24 @@ func WithAlwaysRemoveIntermediateContainers() Opt {
 	}
 }
 
+// WithBuildKit requests building with BuildKit.
+func WithBuildKit() Opt {
+	return func(o *Options) error {
+		o.Version = build.BuilderBuildKit
+		return nil
+	}
+}
+
+// WithBuilderV1 requests building with the classic/deprecated builder in the
+// Docker demon. Please note that this is still morbyd's default unless
+// [WithBuildKit] is explicitly specified. Because we're ... morbyd.
+func WithBuilderV1() Opt {
+	return func(o *Options) error {
+		o.Version = build.BuilderV1
+		return nil
+	}
+}
+
 // WithOutput set the writer to which the output of the image build process is
 // sent to.
 func WithOutput(w io.Writer) Opt {

build/options_test.go

@@ -31,6 +31,8 @@ var _ = Describe("image build options", func() {
 			WithTag("fool"),
 			WithTag("fool:oncemore"),
 
+			WithBuildKit(),
+
 			WithBuildArg("foobar="),
 			WithBuildArgs("foo=bar", "baz"),
 
@@ -48,6 +50,7 @@ var _ = Describe("image build options", func() {
 			Expect(opt(&bios)).NotTo(HaveOccurred())
 		}
 		Expect(bios.Tags).To(ConsistOf("fool", "fool:oncemore"))
+		Expect(bios.Version).To(Equal(build.BuilderBuildKit))
 		Expect(bios.BuildArgs).To(And(
 			HaveLen(3),
 			HaveKeyWithValue("foo", gs.PointTo(Equal("bar"))),
@@ -83,4 +86,10 @@ var _ = Describe("image build options", func() {
 		Expect(WithLabels("foo=", "")(&opts)).Error().To(HaveOccurred())
 	})
 
+	It("sets builder v1", func() {
+		var opts Options
+		Expect(WithBuilderV1()(&opts)).Error().NotTo(HaveOccurred())
+		Expect(opts.Version).To(Equal(build.BuilderV1))
+	})
+
 })

go.mod

@@ -1,11 +1,15 @@
 module github.com/thediveo/morbyd
 
-go 1.24.0
+go 1.24.3
 
 require (
+	github.com/containerd/errdefs v1.0.0
 	github.com/docker/docker v28.5.2+incompatible
 	github.com/docker/go-connections v0.6.0
 	github.com/docker/go-units v0.5.0
+	github.com/golang/protobuf v1.5.4
+	github.com/moby/buildkit v0.26.3
+	github.com/moby/go-archive v0.1.0
 	github.com/moby/patternmatcher v0.6.0
 	github.com/onsi/ginkgo/v2 v2.27.5
 	github.com/onsi/gomega v1.39.0
@@ -19,31 +23,31 @@ require (
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
-	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
-	github.com/moby/go-archive v0.1.0 // indirect
 	github.com/moby/sys/atomicwriter v0.1.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.uber.org/automaxprocs v1.6.0 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/mod v0.32.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
+	google.golang.org/grpc v1.76.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1
+	github.com/containerd/platforms v1.0.0-rc.2
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
+	github.com/klauspost/compress v1.18.1 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/moby/sys/user v0.4.0 // indirect
@@ -52,18 +56,13 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
-	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
-	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	golang.org/x/crypto v0.47.0
 	golang.org/x/net v0.49.0 // indirect
 	golang.org/x/sys v0.40.0 // indirect
 	golang.org/x/text v0.33.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.41.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )