Tweaking SLES Builder

pkg/driverbuilder/builder/builders.go

@@ -234,6 +234,11 @@ func (b *Build) setGCCVersion(builder Builder, kr kernelrelease.KernelRelease) {
 		Debug("foundGCC", "version", b.GCCVersion)
 }
 
+type BuilderImageNetworkMode interface {
+	// sets the network mode of the builder image, allows individual builders to override
+	BuilderImageNetMode() string
+}
+
 func (b *Build) GetBuilderImage() string {
 	if b.hasCustomBuilderImage() {
 		// BuilderImage MUST have requested GCC installed inside

pkg/driverbuilder/builder/sle.go → pkg/driverbuilder/builder/sles.go

@@ -20,45 +20,51 @@ import (
 	"github.com/falcosecurity/driverkit/pkg/kernelrelease"
 )
 
-//go:embed templates/sle.sh
-var sleTemplate string
+//go:embed templates/sles.sh
+var slesTemplate string
 
-// TargetTypeSLE identifies the sle target.
-const TargetTypeSLE Type = "sle"
+// TargetTypeSLES identifies the sles target.
+const TargetTypeSLES Type = "sles"
 
-// sle is a driverkit target.
-type sle struct {
+// sles is a driverkit target.
+type sles struct {
 }
 
 func init() {
-	byTarget[TargetTypeSLE] = &sle{}
+	byTarget[TargetTypeSLES] = &sles{}
 }
 
-type sleTemplateData struct {
+type slesTemplateData struct {
 	commonTemplateData
 	KernelPackage string
 }
 
-func (v *sle) Name() string {
-	return TargetTypeSLE.String()
+func (v *sles) Name() string {
+	return TargetTypeSLES.String()
 }
 
-func (v *sle) TemplateScript() string {
-	return sleTemplate
+func (v *sles) TemplateScript() string {
+	return slesTemplate
 }
 
-func (v *sle) URLs(kr kernelrelease.KernelRelease) ([]string, error) {
+func (v *sles) URLs(kr kernelrelease.KernelRelease) ([]string, error) {
 	return nil, nil
 }
 
-func (v *sle) MinimumURLs() int {
+func (v *sles) MinimumURLs() int {
 	// We don't need any url
 	return 0
 }
 
-func (v *sle) TemplateData(c Config, kr kernelrelease.KernelRelease, _ []string) interface{} {
-	return sleTemplateData{
+func (v *sles) TemplateData(c Config, kr kernelrelease.KernelRelease, _ []string) interface{} {
+	return slesTemplateData{
 		commonTemplateData: c.toTemplateData(v, kr),
 		KernelPackage:      kr.Fullversion + kr.FullExtraversion,
 	}
 }
+
+// sles requires docker to run with `--net=host` for builder images to work
+// for more info, see the suse container connect README: https://github.com/SUSE/container-suseconnect
+func (v *sles) BuilderImageNetMode() string {
+	return "host"
+}

pkg/driverbuilder/docker.go

@@ -22,6 +22,14 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"log/slog"
+	"os"
+	"runtime"
+	"strconv"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
@@ -30,14 +38,7 @@ import (
 	"github.com/falcosecurity/driverkit/pkg/kernelrelease"
 	"github.com/falcosecurity/driverkit/pkg/signals"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
-	"io"
-	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/uuid"
-	"log"
-	"log/slog"
-	"os"
-	"runtime"
-	"strconv"
 )
 
 // DockerBuildProcessorName is a constant containing the docker name.
@@ -85,6 +86,7 @@ func mustCheckArchUseQemu(ctx context.Context, b *builder.Build, cli *client.Cli
 			log.Fatal(err)
 		}
 	}
+
 	qemuImage, err := cli.ContainerCreate(ctx,
 		&container.Config{
 			Cmd:   []string{"--reset", "-p", "yes"},
@@ -203,9 +205,17 @@ func (bp *DockerBuildProcessor) Start(b *builder.Build) error {
 		Image: builderImage,
 	}
 
+	// check for any overridden builder image network modes by the builder
+	var builderImageNetMode = container.NetworkMode("default")
+	if vv, ok := v.(builder.BuilderImageNetworkMode); ok {
+		builderImageNetMode = container.NetworkMode(vv.BuilderImageNetMode())
+	}
+
 	hostCfg := &container.HostConfig{
-		AutoRemove: true,
+		AutoRemove:  true,
+		NetworkMode: builderImageNetMode,
 	}
+
 	uid := uuid.NewUUID()
 	name := fmt.Sprintf("driverkit-%s", string(uid))