Fix using default Docker struct

bringauto · Jan 3, 2025 · 55be4f4 · 55be4f4
1 parent 787d22f
commit 55be4f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/modules/bringauto_build/Build.go b/modules/bringauto_build/Build.go
@@ -27,14 +27,20 @@ type Build struct {
 	sysroot        *bringauto_sysroot.Sysroot
 }
 
+type buildInitArgs struct {
+	DockerImageName string
+}
+
 // FillDefault
 // It fills up defaults for all members in the Build structure.
-func (build *Build) FillDefault(*bringauto_prerequisites.Args) error {
+func (build *Build) FillDefault(args *bringauto_prerequisites.Args) error {
+	var argsStruct buildInitArgs
+	bringauto_prerequisites.GetArgs(args, &argsStruct)
 	if build.Git == nil {
 		build.Git = bringauto_prerequisites.CreateAndInitialize[bringauto_git.Git]()
 	}
 	if build.Docker == nil {
-		build.Docker = bringauto_prerequisites.CreateAndInitialize[bringauto_docker.Docker]()
+		build.Docker = bringauto_prerequisites.CreateAndInitialize[bringauto_docker.Docker](argsStruct.DockerImageName)
 	}
 	if build.SSHCredentials == nil {
 		build.SSHCredentials = bringauto_prerequisites.CreateAndInitialize[bringauto_ssh.SSHCredentials]()

diff --git a/modules/bringauto_config/Config.go b/modules/bringauto_config/Config.go
@@ -89,7 +89,7 @@ func (config *Config) GetBuildStructure(imageName string, platformString *bringa
 			continue
 		}
 		build := config.fillBuildStructure(imageName, platformString)
-		defaultBuild := bringauto_prerequisites.CreateAndInitialize[bringauto_build.Build]()
+		defaultBuild := bringauto_prerequisites.CreateAndInitialize[bringauto_build.Build](imageName)
 		err := copier.CopyWithOption(defaultBuild, build, copier.Option{DeepCopy: true, IgnoreEmpty: true})
 		if err != nil {
 			panic(fmt.Errorf("cannot merge default and real build config"))