feat: add support for multiple adds like copy

Vanilla-OS · Jun 25, 2024 · f4cd7fa · f4cd7fa
1 parent 7b38954
commit f4cd7fa
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/api/structs.go b/api/structs.go
@@ -32,7 +32,7 @@ type Stage struct {
 	Copy        []Copy            `json:"copy"`
 	Labels      map[string]string `json:"labels"`
 	Env         map[string]string `json:"env"`
-	Adds        Add               `json:"adds"`
+	Adds        []Add             `json:"adds"`
 	Args        map[string]string `json:"args"`
 	Runs        Run               `json:"runs"`
 	Expose      map[string]string `json:"expose"`

diff --git a/core/build.go b/core/build.go
@@ -179,21 +179,27 @@ func BuildContainerfile(recipe *api.Recipe) error {
 		}
 
 		// ADDS
-		if stage.Adds.Workdir != "" && stage.Adds.Workdir != recipe.Cwd {
-			_, err = containerfile.WriteString(
-				fmt.Sprintf("WORKDIR %s\n", stage.Adds.Workdir),
-			)
-			recipe.Cwd = stage.Adds.Workdir
-			if err != nil {
-				return err
-			}
-		}
-		for key, value := range stage.Adds.SrcDst {
-			_, err = containerfile.WriteString(
-				fmt.Sprintf("ADD %s %s\n", key, value),
-			)
-			if err != nil {
-				return err
+		if len(stage.Adds) > 0 {
+			for _, add := range stage.Adds {
+				if len(add.SrcDst) > 0 {
+					if add.Workdir != "" && add.Workdir != recipe.Cwd {
+						_, err = containerfile.WriteString(
+							fmt.Sprintf("WORKDIR %s\n", add.Workdir),
+						)
+						recipe.Cwd = add.Workdir
+						if err != nil {
+							return err
+						}
+					}
+					for key, value := range add.SrcDst {
+						_, err = containerfile.WriteString(
+							fmt.Sprintf("ADD %s %s\n", key, value),
+						)
+						if err != nil {
+							return err
+						}
+					}
+				}
 			}
 		}
 

diff --git a/core/loader.go b/core/loader.go
@@ -109,11 +109,13 @@ func LoadRecipe(path string) (*api.Recipe, error) {
 
 	for i, stage := range recipe.Stages {
 		// here we check if the extra Adds path exists
-		for src := range stage.Adds.SrcDst {
-			fullPath := filepath.Join(filepath.Dir(recipePath), src)
-			_, err = os.Stat(fullPath)
-			if os.IsNotExist(err) {
-				return nil, err
+		for _, add := range stage.Adds {
+			for src := range add.SrcDst {
+				fullPath := filepath.Join(filepath.Dir(recipePath), src)
+				_, err = os.Stat(fullPath)
+				if os.IsNotExist(err) {
+					return nil, err
+				}
 			}
 		}