Merge pull request #58 from tsg/update_to_g1.7

Update to Go 1.7

docker/xgo-image-deb6/beats-builder/Dockerfile

@@ -1,4 +1,4 @@
-FROM tudorg/xgo-deb6-1.5.1
+FROM tudorg/xgo-deb6-1.7
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

docker/xgo-image-deb6/build.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 docker build --rm=true -t tudorg/xgo-deb6-base base/ && \
-    docker build --rm=true -t tudorg/xgo-deb6-1.5.1 go-1.5.1/ &&
+    docker build --rm=true -t tudorg/xgo-deb6-1.7 go-1.7/ &&
     docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder

docker/xgo-image-deb6/go-1.5.1/Dockerfile → docker/xgo-image-deb6/go-1.7/Dockerfile

@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.5.1 layer
+# Go cross compiler (xgo): Go 1.7 layer
 # Copyright (c) 2014 Péter Szilágyi. All rights reserved.
 #
 # Released under the MIT license.
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <tudor@elastic.co>
 
 # Configure the root Go distribution and bootstrap based on it
 RUN \
-  export ROOT_DIST=https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz && \
-  export ROOT_DIST_SHA1=46eecd290d8803887dec718c691cc243f2175fe0 && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="a744e29da97fc3aadad1ee0d7d89b0d899645e50" && \
   \
   $BOOTSTRAP_PURE

docker/xgo-image/base/Dockerfile

@@ -21,27 +21,34 @@ RUN chmod +x $FETCH
 # Make sure apt-get is up to date and dependent packages are installed
 RUN \
   apt-get update && \
-  apt-get install -y automake autogen build-essential ca-certificates \
-    gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-multilib gcc-mingw-w64 \
-    clang llvm-dev  libtool libxml2-dev uuid-dev libssl-dev pkg-config \
-    patch make xz-utils cpio wget unzip git mercurial bzr --no-install-recommends
+  apt-get install -y automake autogen build-essential ca-certificates           \
+    gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libc6-dev-armel-cross           \
+    gcc-multilib  g++-multilib mingw-w64 clang llvm-dev                         \
+    libtool libxml2-dev uuid-dev libssl-dev swig pkg-config patch               \
+    make xz-utils cpio wget zip unzip p7zip git mercurial bzr texinfo help2man  \
+    binutils-multiarch rsync                                                    \
+    --no-install-recommends
 
 # Configure the container for OSX cross compilation
-ENV OSX_SDK_PATH https://github.com/trevd/android_platform_build2/raw/master/osxsdks10.6.tar.gz
-ENV OSX_SDK      MacOSX10.6.sdk
+# Configure the container for OSX cross compilation
+ENV OSX_SDK     MacOSX10.11.sdk
+ENV OSX_NDK_X86 /usr/local/osx-ndk-x86
 
 RUN \
+  OSX_SDK_PATH=https://s3.dockerproject.org/darwin/v2/$OSX_SDK.tar.xz && \
+  $FETCH $OSX_SDK_PATH dd228a335194e3392f1904ce49aff1b1da26ca62       && \
+  \
   git clone https://github.com/tpoechtrager/osxcross.git && \
+  mv `basename $OSX_SDK_PATH` /osxcross/tarballs/        && \
   \
-  $FETCH $OSX_SDK_PATH f526b4ae9806e8d31e3b094e3f004f8f160a3fad
-
-RUN \
-  tar -xzf `basename $OSX_SDK_PATH` --strip-components 1 SDKs/$OSX_SDK && \
-  tar -cjf /osxcross/tarballs/$OSX_SDK.tar.bz2 $OSX_SDK && \
-  rm -rf `basename $OSX_SDK_PATH` $OSX_SDK && \
+  sed -i -e 's|-march=native||g' /osxcross/build_clang.sh /osxcross/wrapper/build.sh && \
+  UNATTENDED=yes OSX_VERSION_MIN=10.6 /osxcross/build.sh                             && \
+  mv /osxcross/target $OSX_NDK_X86                                                   && \
   \
-  UNATTENDED=yes /osxcross/build.sh
-ENV PATH /osxcross/target/bin:$PATH
+  rm -rf /osxcross
+
+ADD patch.tar.xz $OSX_NDK_X86/SDK/$OSX_SDK/usr/include/c++
+ENV PATH $OSX_NDK_X86/bin:$PATH
 
 
 # Inject the Go package downloader and tool-chain bootstrapper

docker/xgo-image/beats-builder/Dockerfile

@@ -1,4 +1,4 @@
-FROM tudorg/xgo-1.5.1
+FROM tudorg/xgo-1.7
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

docker/xgo-image/build.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 docker build --rm=true -t tudorg/xgo-base base/ && \
-    docker build --rm=true -t tudorg/xgo-1.5.1 go-1.5.1/ &&
+    docker build --rm=true -t tudorg/xgo-1.7 go-1.7/ &&
     docker build --rm=true -t tudorg/beats-builder beats-builder

docker/xgo-image/go-1.5.1/Dockerfile → docker/xgo-image/go-1.7/Dockerfile

@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.5.1 layer
+# Go cross compiler (xgo): Go 1.7 layer
 # Copyright (c) 2014 Péter Szilágyi. All rights reserved.
 #
 # Released under the MIT license.
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <tudor@elastic.co>
 
 # Configure the root Go distribution and bootstrap based on it
 RUN \
-  export ROOT_DIST=https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz && \
-  export ROOT_DIST_SHA1=46eecd290d8803887dec718c691cc243f2175fe0 && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="a744e29da97fc3aadad1ee0d7d89b0d899645e50" && \
   \
   $BOOTSTRAP_PURE

releases/1.3.0-SNAPSHOT.yml

@@ -0,0 +1,3 @@
+version: 1.3.0-SNAPSHOT
+rpm_version: 1.3.0~SNAPSHOT
+deb_version: 1.3.0~SNAPSHOT