atomic: patch 64bit alignment on 32bit systems

tonistiigi · thaJeztah · commit 6a936578a73e · 2019-09-16T15:32:14.000+02:00
causes panic on armv7

Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
(cherry picked from commit af2e82d054a2276e5ff76fd3fb90915cad5a0a55)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: 776c2bd1137e00b97b4913226f92db2c293012fa
Component: engine
diff --git a/components/engine/builder/builder-next/adapters/containerimage/pull.go b/components/engine/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) {

Original file line number	Diff line number	Diff line change
`@@ -828,9 +828,9 @@ type resolverCache struct {`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`type cachedResolver struct {`
	`831`	`+ counter int64 // needs to be 64bit aligned for 32bit systems`
`831`	`832`	`timeout time.Time`
`832`	`833`	`remotes.Resolver`
`833`		`- counter int64`
`834`	`834`	`}`
`835`	`835`
`836`	`836`	`func (cr *cachedResolver) Resolve(ctx context.Context, ref string) (name string, desc ocispec.Descriptor, err error) {`