Merge pull request #363 from thaJeztah/19.03_backport_64align

kolyshkin · web-flow · commit 190ac5607a55 · 2019-09-18T11:30:26.000+03:00
[19.03 backport] atomic: patch 64bit alignment on 32bit systems
Upstream-commit: 2b10608f16e22670cb03c634dc9acadc6992d3a9
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) {`