Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries

tianon · tianon · commit 065dd231dd7d · 2014-01-31T03:16:42.000-07:00
Docker-DCO-1.1-Signed-off-by: Andrew Page &lt;admwiggin@gmail.com&gt; (github: tianon)
diff --git a/Dockerfile b/Dockerfile
@@ -68,8 +68,9 @@ ENV	GOPATH	/go:/go/src/github.com/dotcloud/docker/vendor
 RUN	cd /usr/local/go/src && ./make.bash --no-clean 2>&1
 
 # Compile Go for cross compilation
-ENV	DOCKER_CROSSPLATFORMS	darwin/amd64 darwin/386
-# TODO add linux/386 and linux/arm
+ENV	DOCKER_CROSSPLATFORMS	linux/386 linux/arm darwin/amd64 darwin/386
+# (set an explicit GOARM of 5 for maximum compatibility)
+ENV	GOARM	5
 RUN	cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
 
 # Grab Go's cover tool for dead-simple code coverage testing
diff --git a/archive/stat_darwin.go b/archive/stat_darwin.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package archive
 
 import "syscall"
diff --git a/execdriver/lxc/lxc_init_linux.go b/execdriver/lxc/lxc_init_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package lxc
 
 import (
diff --git a/execdriver/lxc/lxc_init_unsupported.go b/execdriver/lxc/lxc_init_unsupported.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package lxc
 
 func setHostname(hostname string) error {
diff --git a/graphdriver/aufs/mount_linux.go b/graphdriver/aufs/mount_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package aufs
 
 import "syscall"
diff --git a/graphdriver/aufs/mount_unsupported.go b/graphdriver/aufs/mount_unsupported.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package aufs
 
 import "errors"
diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package btrfs
 
diff --git a/graphdriver/devmapper/attach_loopback.go b/graphdriver/devmapper/attach_loopback.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/deviceset.go b/graphdriver/devmapper/deviceset.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/devmapper.go b/graphdriver/devmapper/devmapper.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/devmapper_log.go b/graphdriver/devmapper/devmapper_log.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/devmapper_test.go b/graphdriver/devmapper/devmapper_test.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/devmapper_wrapper.go b/graphdriver/devmapper/devmapper_wrapper.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/driver.go b/graphdriver/devmapper/driver.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/driver_test.go b/graphdriver/devmapper/driver_test.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/ioctl.go b/graphdriver/devmapper/ioctl.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/mount.go b/graphdriver/devmapper/mount.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/graphdriver/devmapper/sys.go b/graphdriver/devmapper/sys.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 
diff --git a/hack/release.sh b/hack/release.sh
@@ -151,7 +151,8 @@ release_build() {
 			S3ARCH=i386
 			;;
 		arm)
-			# GOARCH is fine
+			S3ARCH=armel
+			# someday, we might potentially support mutliple GOARM values, in which case we might get armhf here too
 			;;
 		*)
 			echo >&2 "error: can't convert $S3ARCH to an appropriate value for 'uname -m'"
diff --git a/pkg/graphdb/conn_linux.go b/pkg/graphdb/conn_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package graphdb
 
 import (
diff --git a/pkg/graphdb/conn_unsupported.go b/pkg/graphdb/conn_unsupported.go
@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package graphdb
 
 func NewSqliteConn(root string) (*Database, error) {
diff --git a/pkg/mount/flags_linux.go b/pkg/mount/flags_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package mount
 
 import (
diff --git a/pkg/mount/flags_unsupported.go b/pkg/mount/flags_unsupported.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package mount
 
 func parseOptions(options string) (int, string) {
diff --git a/pkg/mount/mounter_linux.go b/pkg/mount/mounter_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package mount
 
 import (
diff --git a/pkg/mount/mounter_unsupported.go b/pkg/mount/mounter_unsupported.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package mount
 
 func mount(device, target, mType string, flag uintptr, data string) error {
diff --git a/pkg/netlink/netlink_linux.go b/pkg/netlink/netlink_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package netlink
 
 import (
diff --git a/pkg/netlink/netlink_unsupported.go b/pkg/netlink/netlink_unsupported.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package netlink
 
 import (
diff --git a/reflink_copy_linux.go b/reflink_copy_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package docker
 
 // FIXME: This could be easily rewritten in pure Go
diff --git a/reflink_copy_unsupported.go b/reflink_copy_unsupported.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package docker
 
 import (
diff --git a/utils/uname_linux.go b/utils/uname_linux.go
@@ -1,3 +1,5 @@
+// +build amd64
+
 package utils
 
 import (
diff --git a/utils/uname_unsupported.go b/utils/uname_unsupported.go
@@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package utils
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// +build amd64`
	`2`	`+`
`1`	`3`	`package lxc`
`2`	`4`
`3`	`5`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// +build amd64`
	`2`	`+`
`1`	`3`	`package aufs`
`2`	`4`
`3`	`5`	`import "syscall"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build linux`
	`1`	`+// +build linux,amd64`
`2`	`2`
`3`	`3`	`package btrfs`
`4`	`4`