Merge pull request #4 from tianon/cross-compile-and-release-linux-i386-and-arm-clients

Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
2014-01-31 10:51:25 -08:00 · 2014-01-31 10:51:25 -08:00 · ff6409382b
commit ff6409382b
parent 45dd051e8e 065dd231dd
31 changed files with 51 additions and 23 deletions
--- a/5
+++ b/5
@ -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
--- a/archive/stat_unsupported.go
+++ b/archive/stat_unsupported.go
@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package archive

 import "syscall"
--- a/execdriver/lxc/lxc_init_linux.go
+++ b/execdriver/lxc/lxc_init_linux.go
@ -1,3 +1,5 @@
+// +build amd64
+
 package lxc

 import (
--- 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 {
--- a/graphdriver/aufs/mount_linux.go
+++ b/graphdriver/aufs/mount_linux.go
@ -1,3 +1,5 @@
+// +build amd64
+
 package aufs

 import "syscall"
--- 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"
--- a/graphdriver/btrfs/btrfs.go
+++ b/graphdriver/btrfs/btrfs.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package btrfs

--- a/graphdriver/devmapper/attach_loopback.go
+++ b/graphdriver/devmapper/attach_loopback.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/deviceset.go
+++ b/graphdriver/devmapper/deviceset.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/devmapper.go
+++ b/graphdriver/devmapper/devmapper.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/devmapper_log.go
+++ b/graphdriver/devmapper/devmapper_log.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/devmapper_test.go
+++ b/graphdriver/devmapper/devmapper_test.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/devmapper_wrapper.go
+++ b/graphdriver/devmapper/devmapper_wrapper.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/driver.go
+++ b/graphdriver/devmapper/driver.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/driver_test.go
+++ b/graphdriver/devmapper/driver_test.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/ioctl.go
+++ b/graphdriver/devmapper/ioctl.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/mount.go
+++ b/graphdriver/devmapper/mount.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- a/graphdriver/devmapper/sys.go
+++ b/graphdriver/devmapper/sys.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64

 package devmapper

--- 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'"
--- a/pkg/graphdb/conn_linux.go
+++ b/pkg/graphdb/conn_linux.go
@ -1,3 +1,5 @@
+// +build amd64
+
 package graphdb

 import (
--- 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) {
--- a/pkg/mount/flags_linux.go
+++ b/pkg/mount/flags_linux.go
@ -1,3 +1,5 @@
+// +build amd64
+
 package mount

 import (
--- 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) {
--- a/pkg/mount/mounter_linux.go
+++ b/pkg/mount/mounter_linux.go
@ -1,3 +1,5 @@
+// +build amd64
+
 package mount

 import (
--- 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 {
--- a/pkg/netlink/netlink_linux.go
+++ b/pkg/netlink/netlink_linux.go
@ -1,3 +1,5 @@
+// +build amd64
+
 package netlink

 import (
--- 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 (
--- 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
--- a/reflink_copy_unsupported.go
+++ b/reflink_copy_unsupported.go
@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package docker

 import (
--- a/utils/uname_linux.go
+++ b/utils/uname_linux.go
@ -1,3 +1,5 @@
+// +build amd64
+
 package utils

 import (
--- a/utils/uname_unsupported.go
+++ b/utils/uname_unsupported.go
@ -1,4 +1,5 @@
-// +build: !linux !amd64
+// +build !linux !amd64
+
 package utils

 import (