From 4adb6a39923ec778dfc74aec3abce9017e93eab5 Mon Sep 17 00:00:00 2001
From: Ilya Lesikov <ilya@lesikov.com>
Date: Fri, 28 Jan 2022 16:24:03 +0300
Subject: [PATCH] feat(images-imports): respect dependencies during build

---
 pkg/config/stapel_image_base.go      | 4 ++++
 pkg/config/stapel_image_interface.go | 1 +
 pkg/config/werf.go                   | 7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/pkg/config/stapel_image_base.go b/pkg/config/stapel_image_base.go
index be8aac998a..c16d8905d8 100644
--- a/pkg/config/stapel_image_base.go
+++ b/pkg/config/stapel_image_base.go
@@ -37,6 +37,10 @@ func (c *StapelImageBase) imports() []*Import {
 	return c.Import
 }
 
+func (c *StapelImageBase) dependencies() []*Dependency {
+	return c.Dependencies
+}
+
 func (c *StapelImageBase) ImageBaseConfig() *StapelImageBase {
 	return c
 }
diff --git a/pkg/config/stapel_image_interface.go b/pkg/config/stapel_image_interface.go
index 6776ee0727..f573112c65 100644
--- a/pkg/config/stapel_image_interface.go
+++ b/pkg/config/stapel_image_interface.go
@@ -7,4 +7,5 @@ type StapelImageInterface interface {
 	IsArtifact() bool
 
 	imports() []*Import
+	dependencies() []*Dependency
 }
diff --git a/pkg/config/werf.go b/pkg/config/werf.go
index 77b9dc01de..e703e40c95 100644
--- a/pkg/config/werf.go
+++ b/pkg/config/werf.go
@@ -387,7 +387,14 @@ func (c *WerfConfig) imageDependencies(interf ImageInterface) (deps []ImageInter
 				deps = append(deps, c.GetArtifact(imp.ArtifactName))
 			}
 		}
+
+		for _, dep := range i.dependencies() {
+			deps = append(deps, c.GetImage(dep.ImageName))
+		}
 	case *ImageFromDockerfile:
+		for _, dep := range i.Dependencies {
+			deps = append(deps, c.GetImage(dep.ImageName))
+		}
 	}
 
 	return deps