kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-01-31 03:16:42 -07:00
parent 45dd051e8e
commit 065dd231dd
31 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -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 RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
# Compile Go for cross compilation # Compile Go for cross compilation
ENV DOCKER_CROSSPLATFORMS darwin/amd64 darwin/386 ENV DOCKER_CROSSPLATFORMS linux/386 linux/arm darwin/amd64 darwin/386
# TODO add linux/386 and linux/arm # (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' 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 # Grab Go's cover tool for dead-simple code coverage testing

3
archive/stat_unsupported.go → archive/stat_darwin.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package archive package archive
import "syscall" import "syscall"

2
execdriver/lxc/lxc_init_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package lxc package lxc
import ( import (

3
execdriver/lxc/lxc_init_unsupported.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package lxc package lxc
func setHostname(hostname string) error { func setHostname(hostname string) error {

2
graphdriver/aufs/mount_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package aufs package aufs
import "syscall" import "syscall"

3
graphdriver/aufs/mount_unsupported.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package aufs package aufs
import "errors" import "errors"

2
graphdriver/btrfs/btrfs.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package btrfs package btrfs

2
graphdriver/devmapper/attach_loopback.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/deviceset.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/devmapper.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/devmapper_log.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/devmapper_test.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/devmapper_wrapper.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/driver.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/driver_test.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/ioctl.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/mount.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

2
graphdriver/devmapper/sys.go
View file

@ -1,4 +1,4 @@
// +build linux // +build linux,amd64
package devmapper package devmapper

3
hack/release.sh
View file

@ -151,7 +151,8 @@ release_build() {
S3ARCH=i386 S3ARCH=i386
;; ;;
arm) 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'" echo >&2 "error: can't convert $S3ARCH to an appropriate value for 'uname -m'"

2
pkg/graphdb/conn_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package graphdb package graphdb
import ( import (

2
pkg/graphdb/conn_darwin.go → pkg/graphdb/conn_unsupported.go
View file

@ -1,3 +1,5 @@
// +build !linux !amd64
package graphdb package graphdb
func NewSqliteConn(root string) (*Database, error) { func NewSqliteConn(root string) (*Database, error) {

2
pkg/mount/flags_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package mount package mount
import ( import (

3
pkg/mount/flags_unsupported.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package mount package mount
func parseOptions(options string) (int, string) { func parseOptions(options string) (int, string) {

2
pkg/mount/mounter_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package mount package mount
import ( import (

3
pkg/mount/mounter_unsupported.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package mount package mount
func mount(device, target, mType string, flag uintptr, data string) error { func mount(device, target, mType string, flag uintptr, data string) error {

2
pkg/netlink/netlink_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package netlink package netlink
import ( import (

3
pkg/netlink/netlink_unsupported.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package netlink package netlink
import ( import (

2
reflink_copy_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package docker package docker
// FIXME: This could be easily rewritten in pure Go // FIXME: This could be easily rewritten in pure Go

3
reflink_copy_unsupported.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package docker package docker
import ( import (

2
utils/uname_linux.go
View file

@ -1,3 +1,5 @@
// +build amd64
package utils package utils
import ( import (

3
utils/uname_unsupported.go
View file

@ -1,4 +1,5 @@
// +build: !linux !amd64 // +build !linux !amd64
package utils package utils
import ( import (