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.
57 lines
2.5 KiB
57 lines
2.5 KiB
Index: src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go |
|
--- src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go.orig 2018-11-08 20:36:50.000000000 +0100 |
|
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2018-11-08 20:41:19.616194000 +0100 |
|
@@ -1,4 +1,4 @@ |
|
-// +build !windows,!darwin,!linux |
|
+// +build !windows,!darwin,!linux,!freebsd |
|
|
|
package credentials |
|
|
|
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go |
|
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2018-11-08 20:37:46.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2018-11-08 20:41:19.616334000 +0100 |
|
@@ -62,7 +62,7 @@ |
|
s, ok := stat.(*syscall.Stat_t) |
|
|
|
if ok { |
|
- inode = s.Ino |
|
+ inode = uint64(s.Ino) |
|
} |
|
|
|
return |
|
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go |
|
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2018-11-08 20:37:46.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2018-11-08 20:41:19.616442000 +0100 |
|
@@ -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/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go |
|
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-11-08 20:37:46.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go 2018-11-08 20:41:19.616557000 +0100 |
|
@@ -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/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go |
|
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2018-11-08 20:37:11.000000000 +0100 |
|
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2018-11-08 20:42:38.834658000 +0100 |
|
@@ -45,7 +45,7 @@ |
|
stat.Devminor = int64(minor(uint64(s.Rdev))) |
|
} |
|
|
|
- ino := s.Ino |
|
+ ino := uint64(s.Ino) |
|
if seenFiles != nil { |
|
if s.Nlink > 1 { |
|
if oldpath, ok := seenFiles[ino]; ok {
|
|
|