Navigation Menu

Skip to content

Commit

Permalink
fix(multiarch): fix panic which occurs when using stapel import from …
Browse files Browse the repository at this point in the history
…certain stage

Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
  • Loading branch information
distorhead committed Mar 22, 2023
1 parent 84c3c5b commit 431673f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/build/stage/dependencies.go
Expand Up @@ -440,7 +440,7 @@ func getSourceImageDockerImageName(c Conveyor, targetPlatform string, importElm
if importElm.Stage == "" {
sourceImageDockerImageName = c.GetImageNameForLastImageStage(targetPlatform, sourceImageName)
} else {
sourceImageDockerImageName = c.GetImageNameForImageStage(sourceImageName, targetPlatform, importElm.Stage)
sourceImageDockerImageName = c.GetImageNameForImageStage(targetPlatform, sourceImageName, importElm.Stage)
}

return sourceImageDockerImageName
Expand All @@ -453,7 +453,7 @@ func getSourceImageID(c Conveyor, targetPlatform string, importElm *config.Impor
if importElm.Stage == "" {
sourceImageID = c.GetImageIDForLastImageStage(targetPlatform, sourceImageName)
} else {
sourceImageID = c.GetImageIDForImageStage(sourceImageName, targetPlatform, importElm.Stage)
sourceImageID = c.GetImageIDForImageStage(targetPlatform, sourceImageName, importElm.Stage)
}

return sourceImageID
Expand All @@ -466,7 +466,7 @@ func getSourceImageContentDigest(c Conveyor, targetPlatform string, importElm *c
if importElm.Stage == "" {
sourceImageContentDigest = c.GetImageContentDigest(targetPlatform, sourceImageName)
} else {
sourceImageContentDigest = c.GetImageStageContentDigest(sourceImageName, targetPlatform, importElm.Stage)
sourceImageContentDigest = c.GetImageStageContentDigest(targetPlatform, sourceImageName, importElm.Stage)
}

return sourceImageContentDigest
Expand Down

0 comments on commit 431673f

Please sign in to comment.