mirror of
https://github.com/GoogleContainerTools/kaniko
synced 2026-10-18 04:40:52 +02:00
Upgrade docker (#2440)
* somehow now the only thing that doesnt work is devices.Device Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * this gets rid of all the compiler errors in the vendored code Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * fixed some things but a bunch of tests and maybe some compiler steps are still failing Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * all the things i figured out how to fix so far Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * guess i had to redo go mods after rebasing again Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * update docker constants to be SHOUTY CASE now Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * include DestPath in resolveEnv Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * fix one mistake in Docker lib upgrade and some typos/deprecations in the file Signed-off-by: Joe Kimmel <jkimmel@vmware.com> * last changes (hopefully) to update to new docker libs Signed-off-by: Joe Kimmel <jkimmel@vmware.com> --------- Signed-off-by: Joe Kimmel <jkimmel@vmware.com>
This commit is contained in:
+4
-4
@@ -79,7 +79,7 @@ func Enable(err error) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func Wrap(err error, s Stack) error {
|
||||
func Wrap(err error, s *Stack) error {
|
||||
return &withStack{stack: s, error: err}
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ func convertStack(s errors.StackTrace) *Stack {
|
||||
if idx == -1 {
|
||||
continue
|
||||
}
|
||||
line, err := strconv.Atoi(p[1][idx+1:])
|
||||
line, err := strconv.ParseInt(p[1][idx+1:], 10, 32)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
@@ -169,7 +169,7 @@ func convertStack(s errors.StackTrace) *Stack {
|
||||
}
|
||||
|
||||
type withStack struct {
|
||||
stack Stack
|
||||
stack *Stack
|
||||
error
|
||||
}
|
||||
|
||||
@@ -178,5 +178,5 @@ func (e *withStack) Unwrap() error {
|
||||
}
|
||||
|
||||
func (e *withStack) StackTrace() *Stack {
|
||||
return &e.stack
|
||||
return e.stack
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user