JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util: patch atomic 64bit alignment 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-19.03
Tonis Tiigi 2019-07-16 16:52:24 -07:00
parent 82c91badd3
commit 61a4e20547
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/pull/resolver.go
View File

@ -67,7 +67,7 @@ func withLocal(r remotes.Resolver, imageStore images.Store, mode source.ResolveM
return r return r
} }
return withLocalResolver{r, imageStore, mode, 0} return withLocalResolver{Resolver: r, is: imageStore, mode: mode}
} }
func getCredentialsFromSession(ctx context.Context, sm *session.Manager) func(string) (string, string, error) { func getCredentialsFromSession(ctx context.Context, sm *session.Manager) func(string) (string, string, error) {
@ -101,10 +101,10 @@ func getCredentialsFromSession(ctx context.Context, sm *session.Manager) func(st
// - Pusher wouldn't make sense to push locally, so just forward. // - Pusher wouldn't make sense to push locally, so just forward.
type withLocalResolver struct { type withLocalResolver struct {
counter int64 // needs to be 64bit aligned for 32bit systems
remotes.Resolver remotes.Resolver
is images.Store is images.Store
mode source.ResolveMode mode source.ResolveMode
counter int64
} }
func (r withLocalResolver) Resolve(ctx context.Context, ref string) (string, ocispec.Descriptor, error) { func (r withLocalResolver) Resolve(ctx context.Context, ref string) (string, ocispec.Descriptor, error) {