From 61a4e205474d9d4e2b406dcddea4dc68b3af4b89 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 16 Jul 2019 16:52:24 -0700 Subject: [PATCH] util: patch atomic 64bit alignment Signed-off-by: Tonis Tiigi --- util/pull/resolver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/pull/resolver.go b/util/pull/resolver.go index 750b2e40..4c3f2726 100644 --- a/util/pull/resolver.go +++ b/util/pull/resolver.go @@ -67,7 +67,7 @@ func withLocal(r remotes.Resolver, imageStore images.Store, mode source.ResolveM 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) { @@ -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. type withLocalResolver struct { + counter int64 // needs to be 64bit aligned for 32bit systems remotes.Resolver - is images.Store - mode source.ResolveMode - counter int64 + is images.Store + mode source.ResolveMode } func (r withLocalResolver) Resolve(ctx context.Context, ref string) (string, ocispec.Descriptor, error) {