Skip to content

Commit 431673f

Browse files
committed
fix(multiarch): fix panic which occurs when using stapel import from certain stage
Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
1 parent 84c3c5b commit 431673f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/build/stage/dependencies.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ func getSourceImageDockerImageName(c Conveyor, targetPlatform string, importElm
440440
if importElm.Stage == "" {
441441
sourceImageDockerImageName = c.GetImageNameForLastImageStage(targetPlatform, sourceImageName)
442442
} else {
443-
sourceImageDockerImageName = c.GetImageNameForImageStage(sourceImageName, targetPlatform, importElm.Stage)
443+
sourceImageDockerImageName = c.GetImageNameForImageStage(targetPlatform, sourceImageName, importElm.Stage)
444444
}
445445

446446
return sourceImageDockerImageName
@@ -453,7 +453,7 @@ func getSourceImageID(c Conveyor, targetPlatform string, importElm *config.Impor
453453
if importElm.Stage == "" {
454454
sourceImageID = c.GetImageIDForLastImageStage(targetPlatform, sourceImageName)
455455
} else {
456-
sourceImageID = c.GetImageIDForImageStage(sourceImageName, targetPlatform, importElm.Stage)
456+
sourceImageID = c.GetImageIDForImageStage(targetPlatform, sourceImageName, importElm.Stage)
457457
}
458458

459459
return sourceImageID
@@ -466,7 +466,7 @@ func getSourceImageContentDigest(c Conveyor, targetPlatform string, importElm *c
466466
if importElm.Stage == "" {
467467
sourceImageContentDigest = c.GetImageContentDigest(targetPlatform, sourceImageName)
468468
} else {
469-
sourceImageContentDigest = c.GetImageStageContentDigest(sourceImageName, targetPlatform, importElm.Stage)
469+
sourceImageContentDigest = c.GetImageStageContentDigest(targetPlatform, sourceImageName, importElm.Stage)
470470
}
471471

472472
return sourceImageContentDigest

0 commit comments

Comments
 (0)