From 776c2bd1137e00b97b4913226f92db2c293012fa Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Tue, 16 Jul 2019 16:57:38 -0700
Subject: [PATCH] atomic: patch 64bit alignment on 32bit systems

causes panic on armv7

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit af2e82d054a2276e5ff76fd3fb90915cad5a0a55)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 builder/builder-next/adapters/containerimage/pull.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
index 2af7d4d41e..729ef52ae8 100644
--- a/builder/builder-next/adapters/containerimage/pull.go
+++ b/builder/builder-next/adapters/containerimage/pull.go
@@ -828,9 +828,9 @@ type resolverCache struct {
 }
 
 type cachedResolver struct {
+	counter int64 // needs to be 64bit aligned for 32bit systems
 	timeout time.Time
 	remotes.Resolver
-	counter int64
 }
 
 func (cr *cachedResolver) Resolve(ctx context.Context, ref string) (name string, desc ocispec.Descriptor, err error) {