Skip to content
This repository has been archived by the owner on May 27, 2023. It is now read-only.

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jason committed Jul 25, 2019
1 parent e7881f3 commit 3e605d3
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions container/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -1310,6 +1310,7 @@ func DockerMerge(name, user, pass string) *Error {
if ierr != nil {
return ierr
}
//new layer name : size
ret[new_image_name] = size
mdata["layer"] = ret
mdata["layer_order"] = new_image_name
Expand All @@ -1326,16 +1327,12 @@ func DockerMerge(name, user, pass string) *Error {
var docinfo DockerInfo
docinfo.Name = name
layersmap := make(map[string]int64)
//sha256:size
for k, v := range ret {
layersmap[path.Base(k)] = v
}
docinfo.LayersMap = layersmap

var layer_sha []string
for _, layer := range layer_order {
layer_sha = append(layer_sha, path.Base(layer))
}
docinfo.Layers = strings.Join(layer_sha, ":")
docinfo.Layers = sha256

dinfodata, _ := StructMarshal(docinfo)
err = WriteToFile(dinfodata, fmt.Sprintf("%s/.info", mdata["rootdir"].(string)))
Expand Down

0 comments on commit 3e605d3

Please sign in to comment.