GitList

Browse code

Merge pull request #363 from thaJeztah/19.03_backport_64align

[19.03 backport] atomic: patch 64bit alignment on 32bit systems

Kirill Kolyshkin authored on 2019/09/18 17:30:26
Showing 1 changed files

builder/builder-next/adapters/containerimage/pull.go index 2af7d4d..729ef52 100644

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) {

...	...	@@ -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) {