simplify the check

Signed-off-by: Logan Bond <logantbond@gmail.com>

Author: EXONER4TED

pkg/driverbuilder/builder/build.go

@@ -27,29 +27,28 @@ var defaultImageTag = "latest" // This is overwritten when using the Makefile to
 
 // Build contains the info about the on-going build.
 type Build struct {
-	TargetType              Type
-	KernelConfigData        string
-	KernelRelease           string
-	KernelVersion           string
-	DriverVersion           string
-	Architecture            string
-	ModuleFilePath          string
-	ProbeFilePath           string
-	ModuleDriverName        string
-	ModuleDeviceName        string
-	BuilderImage            string
-	BuilderRepos            []string
-	ImagesListers           []ImagesLister
-	KernelUrls              []string
-	GCCVersion              string
-	RepoOrg                 string
-	RepoName                string
-	Images                  ImagesMap
-	RegistryName            string
-	RegistryUser            string
-	RegistryPassword        string
-	RegistryPlainHTTP       bool
-	BuilderImageNetworkMode string
+	TargetType        Type
+	KernelConfigData  string
+	KernelRelease     string
+	KernelVersion     string
+	DriverVersion     string
+	Architecture      string
+	ModuleFilePath    string
+	ProbeFilePath     string
+	ModuleDriverName  string
+	ModuleDeviceName  string
+	BuilderImage      string
+	BuilderRepos      []string
+	ImagesListers     []ImagesLister
+	KernelUrls        []string
+	GCCVersion        string
+	RepoOrg           string
+	RepoName          string
+	Images            ImagesMap
+	RegistryName      string
+	RegistryUser      string
+	RegistryPassword  string
+	RegistryPlainHTTP bool
 }
 
 func (b *Build) KernelReleaseFromBuildConfig() kernelrelease.KernelRelease {

pkg/driverbuilder/builder/builders.go

@@ -239,11 +239,6 @@ type BuilderImageNetworkMode interface {
 	BuilderImageNetMode() string
 }
 
-// set the default builder image network mode to default
-func (b *Build) BuilderImageNetMode() string {
-	return "default"
-}
-
 func (b *Build) GetBuilderImage() string {
 	if b.hasCustomBuilderImage() {
 		// BuilderImage MUST have requested GCC installed inside

pkg/driverbuilder/docker.go

@@ -205,9 +205,15 @@ 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,
-		NetworkMode: container.NetworkMode(b.BuilderImageNetworkMode),
+		NetworkMode: builderImageNetMode,
 	}
 
 	uid := uuid.NewUUID()