opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 21:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix e2e test failure

Browse Source 
it is possible for layers.names to be nil and we must account for that.

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2020-01-10 10:26:43 -06:00
parent c3956b1974
commit 986feef2e8
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/image/image.go
View File

@ -841,15 +841,17 @@ func (i *Image) History(ctx context.Context) ([]*History, error) {
delete(topLayerMap, layer.ID) delete(topLayerMap, layer.ID)
} }
} }
h := History{
allHistory = append(allHistory, &History{
ID: id, ID: id,
Created: oci.History[x].Created, Created: oci.History[x].Created,
CreatedBy: oci.History[x].CreatedBy, CreatedBy: oci.History[x].CreatedBy,
Size: size, Size: size,
Comment: oci.History[x].Comment, Comment: oci.History[x].Comment,
Tags: layer.Names, }
}) if layer != nil {
h.Tags = layer.Names
}
allHistory = append(allHistory, &h)
if layer != nil && layer.Parent != "" && !oci.History[x].EmptyLayer { if layer != nil && layer.Parent != "" && !oci.History[x].EmptyLayer {
layer, err = i.imageruntime.store.Layer(layer.Parent) layer, err = i.imageruntime.store.Layer(layer.Parent)

6
pkg/api/handlers/images_build.go
View File

@ -19,12 +19,6 @@ import (
) )
func BuildImage(w http.ResponseWriter, r *http.Request) { func BuildImage(w http.ResponseWriter, r *http.Request) {
// contentType := r.Header.Get("Content-Type")
// if contentType != "application/x-tar" {
// Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, errors.New("/build expects Content-Type of 'application/x-tar'"))
// return
// }
authConfigs := map[string]AuthConfig{} authConfigs := map[string]AuthConfig{}
if hasHeader(r, "X-Registry-Config") { if hasHeader(r, "X-Registry-Config") {
registryHeader := getHeader(r, "X-Registry-Config") registryHeader := getHeader(r, "X-Registry-Config")