fix(multiarch): managed images adding bug fix

Bug was introduced after moving managed-images-adding procedure into AfterImages phase hook.

Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>

pkg/build/build_phase.go

@@ -81,10 +81,8 @@ type BuildPhase struct {
 	BasePhase
 	BuildPhaseOptions
 
-	StagesIterator              *StagesIterator
-	ShouldAddManagedImageRecord bool
-
-	ImagesReport *ImagesReport
+	StagesIterator *StagesIterator
+	ImagesReport   *ImagesReport
 
 	buildContextArchive container_backend.BuildContextArchiver
 }
@@ -473,7 +471,7 @@ func (phase *BuildPhase) AfterImageStages(ctx context.Context, img *image.Image)
 }
 
 func (phase *BuildPhase) addManagedImage(ctx context.Context, name string) error {
-	if phase.ShouldAddManagedImageRecord {
+	if phase.Conveyor.ShouldAddManagedImagesRecords() {
 		stagesStorage := phase.Conveyor.StorageManager.GetStagesStorage()
 		exist, err := stagesStorage.IsManagedImageExist(ctx, phase.Conveyor.ProjectName(), name, storage.WithCache())
 		if err != nil {
@@ -674,7 +672,7 @@ func (phase *BuildPhase) onImageStage(ctx context.Context, img *image.Image, stg
 	}
 
 	// Add managed image record only if there was at least one newly built stage
-	phase.ShouldAddManagedImageRecord = true
+	phase.Conveyor.SetShouldAddManagedImagesRecords()
 
 	return nil
 }

pkg/build/conveyor.go

@@ -45,6 +45,8 @@ type Conveyor struct {
 	giterminismManager giterminism_manager.Interface
 	remoteGitRepos     map[string]*git_repo.Remote
 
+	shouldAddManagedImagesRecords bool
+
 	tmpDir string
 
 	ContainerBackend container_backend.ContainerBackend
@@ -337,6 +339,18 @@ func (c *Conveyor) GetRemoteGitRepo(key string) *git_repo.Remote {
 	return c.remoteGitRepos[key]
 }
 
+func (c *Conveyor) SetShouldAddManagedImagesRecords() {
+	c.GetServiceRWMutex("ShouldAddManagedImagesRecords").RLock()
+	defer c.GetServiceRWMutex("ShouldAddManagedImagesRecords").RUnlock()
+	c.shouldAddManagedImagesRecords = true
+}
+
+func (c *Conveyor) ShouldAddManagedImagesRecords() bool {
+	c.GetServiceRWMutex("ShouldAddManagedImagesRecords").RLock()
+	defer c.GetServiceRWMutex("ShouldAddManagedImagesRecords").RUnlock()
+	return c.shouldAddManagedImagesRecords
+}
+
 type ShouldBeBuiltOptions struct {
 	CustomTagFuncList []imagePkg.CustomTagFunc
 }