UPSTREAM: openshift/source-to-image: 711: Incorrect image user order
@@ -432,9 +432,9 @@ func (d *stiDocker) GetImageUser(name string) (string, error) {
glog.V(4).Infof("error inspecting image %s: %v", name, err)
return "", s2ierr.NewInspectImageError(name, err)
}
- user := resp.ContainerConfig.User
+ user := resp.Config.User
if len(user) == 0 {
- user = resp.Config.User
+ user = resp.ContainerConfig.User
}
return user, nil
}
