You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

48 lines
2.2 KiB

Index: src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/archive/archive_unix.go
--- src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2018-07-01 13:22:34.000000000 +0200
+++ src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2018-07-01 13:35:59.891641000 +0200
@@ -62,7 +62,7 @@
s, ok := stat.(*syscall.Stat_t)
if ok {
- inode = s.Ino
+ inode = uint64(s.Ino)
}
return
Index: src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/archive/changes_unix.go
--- src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2018-07-01 13:22:33.000000000 +0200
+++ src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2018-07-01 13:35:59.891776000 +0200
@@ -29,7 +29,7 @@
}
func getIno(fi os.FileInfo) uint64 {
- return fi.Sys().(*syscall.Stat_t).Ino
+ return uint64(fi.Sys().(*syscall.Stat_t).Ino)
}
func hasHardlinks(fi os.FileInfo) bool {
Index: src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
--- src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-07-01 13:22:33.000000000 +0200
+++ src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go 2018-07-01 13:39:17.643070000 +0200
@@ -37,7 +37,7 @@
if filter != nil {
// filter out entries we're not interested in
- skip, stop = filter(p)
+ skip, stop = filter(&mountinfo)
if skip {
continue
}
Index: src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/vendor/github.com/tonistiigi/fsutil/walker_unix.go
--- src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/vendor/github.com/tonistiigi/fsutil/walker_unix.go.orig 2018-07-01 13:21:49.000000000 +0200
+++ src/github.com/kubernetes/kompose/vendor/github.com/docker/docker/vendor/github.com/tonistiigi/fsutil/walker_unix.go 2018-07-01 13:35:59.891921000 +0200
@@ -41,7 +41,7 @@
stat.Devminor = int64(minor(uint64(s.Rdev)))
}
- ino := s.Ino
+ ino := uint64(s.Ino)
if s.Nlink > 1 {
if oldpath, ok := seenFiles[ino]; ok {
stat.Linkname = oldpath