Update cross-binary script

Add support for more arch too and remove the use of `gox`.

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

Diff for: Dockerfile

@@ -9,18 +9,10 @@ RUN apt-get update && \
     easy_install pip && pip install virtualenv
 
 # Install build dependencies
-RUN go get github.com/mitchellh/gox && \
-    go get github.com/aktau/github-release && \
+RUN go get github.com/aktau/github-release && \
     go get golang.org/x/tools/cmd/cover && \
     go get github.com/golang/lint/golint
 
-# Compile Go for cross compilation
-ENV DOCKER_CROSSPLATFORMS \
-	linux/386 linux/arm \
-	darwin/amd64 darwin/386 \
-	freebsd/amd64 freebsd/386 freebsd/arm \
-	windows/amd64 windows/386
-
 # Which docker version to test on and what default one to use
 ENV DOCKER_VERSIONS 1.9.1 1.10.3 1.11.0
 ENV DEFAULT_DOCKER_VERSION 1.10.3

Diff for: script/cross-binary

@@ -2,23 +2,38 @@
 set -e
 
 if [ -z "$1" ]; then
-    OS_PLATFORM_ARG=(-os="darwin linux windows")
+    # Remove windows platform because of
+    # https://github.com/mailgun/log/issues/10
+    OS_PLATFORM_ARG=(linux windows darwin freebsd)
 else
     OS_PLATFORM_ARG=($1)
 fi
 
 if [ -z "$2" ]; then
-    OS_ARCH_ARG=(-arch="386 amd64 arm")
+    OS_ARCH_ARG=(386 amd64 arm)
 else
     OS_ARCH_ARG=($2)
 fi
 
 # Get rid of existing binaries
-rm -f libcompose-cli*
+rm -f bundles/libcompose-cli*
 
 # Build binaries
-gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \
-    -output="bundles/libcompose-cli_{{.OS}}-{{.Arch}}" \
-    -ldflags="-w -X github.com/docker/libcompose/version.GITCOMMIT=`git rev-parse --short HEAD`" \
-    ./cli/main
-
+for OS in ${OS_PLATFORM_ARG[@]}; do
+    for ARCH in ${OS_ARCH_ARG[@]}; do
+        OUTPUT_BIN="bundles/libcompose-cli_$OS-$ARCH"
+        if test "$ARCH" = "arm"; then
+            if test "$OS" = "windows" || test "$OS" = "darwin"; then
+                # windows/arm and darwin/arm does not compile without cgo :-|
+                continue
+            fi
+        fi
+        if test "$OS" = "windows"; then
+            OUTPUT_BIN="${OUTPUT_BIN}.exe"
+        fi
+        echo "Building binary for $OS/$ARCH..."
+        GOARCH=$ARCH GOOS=$OS CGO_ENABLED=0 go build \
+              -ldflags="-w -X github.com/docker/libcompose/version.GITCOMMIT=`git rev-parse --short HEAD`" \
+              -o ${OUTPUT_BIN} ./cli/main
+    done
+done