Skip to content

Commit

Permalink
Remove unnecessary check on layer ordering
Browse files Browse the repository at this point in the history
Signed-off-by: Natalie Arellano <[email protected]>
  • Loading branch information
natalieparellano committed Feb 1, 2024
1 parent 5a1af60 commit a65b1a9
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions locallayout/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,25 +175,23 @@ func (s *Store) addImageToTar(tw *tar.Writer, image v1.Image, withName string) e
return err
}
var (
layerPaths []string
blankIdx int
processingBaseLayer = true
layerPaths []string
blankIdx int
)
for _, layer := range layers {
var layerName string
size, err := layer.Size()
if err != nil {
return err
}
if size == -1 && processingBaseLayer { // layer facade fronting empty layer
if size == -1 { // layer facade fronting empty layer
layerName = fmt.Sprintf("blank_%d", blankIdx)
blankIdx++
hdr := &tar.Header{Name: layerName, Mode: 0644, Size: 0}
if err := tw.WriteHeader(hdr); err != nil {
return err
}
} else {
processingBaseLayer = false // once we have layer data, we can't rely on future layers being in the daemon
layerName, err = s.addLayerToTar(tw, layer)
if err != nil {
return err
Expand Down

0 comments on commit a65b1a9

Please sign in to comment.