fix: panic when --cache-repo used

Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
werf · May 16, 2022 · ec2ed93 · ec2ed93
1 parent c59f1f9
commit ec2ed93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/container_backend/legacy_base_image.go b/pkg/container_backend/legacy_base_image.go
@@ -57,6 +57,7 @@ func (i *legacyBaseImage) UnsetInfo() {
 
 func (i *legacyBaseImage) SetStageDescription(stageDesc *image.StageDescription) {
 	i.stageDesc = stageDesc
+	i.SetInfo(stageDesc.Info)
 }
 
 func (i *legacyBaseImage) GetStageDescription() *image.StageDescription {

diff --git a/pkg/storage/manager/storage_manager.go b/pkg/storage/manager/storage_manager.go
@@ -466,6 +466,15 @@ func (m *StorageManager) FetchStage(ctx context.Context, containerBackend contai
 			}
 		} else {
 			logboek.Context(ctx).Info().LogF("Cache repo image %s exists locally, will not perform fetch\n", stageImage.Name())
+
+			stageDesc, err := getStageDescription(ctx, m.ProjectName, *stageID, stagesStorage, nil, getStageDescriptionOptions{WithLocalManifestCache: true})
+			if err != nil {
+				return nil, fmt.Errorf("error getting stage %s description from %s: %w", stageID.String(), m.FinalStagesStorage.String(), err)
+			}
+			if stageDesc == nil {
+				return nil, ErrStageNotFound
+			}
+			stageImage.SetStageDescription(stageDesc)
 		}
 
 		if err := lrumeta.CommonLRUImagesCache.AccessImage(ctx, stageImage.Name()); err != nil {