Upgrade Go to 1.8.3 (#4401)

elastic · May 28, 2017 · 82203e0 · 82203e0
1 parent 3a58887
commit 82203e0
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 17 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.8.1
+1.8.3
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -57,6 +57,7 @@ https://github.com/elastic/beats/compare/v6.0.0-alpha1...master[Check the HEAD d
 
 *Affecting all Beats*
 
+- Upgraded to Golang 1.8.3. {pull}4401[4401]
 - Added the possibility to set Elasticsearch mapping template settings from the Beat configuration file. {pull}4284[4284] {pull}4317[4317]
 - Add a variable to the SysV init scripts to make it easier to change the user. {pull}4340[4340]
 - Add the option to write the generated Elasticsearch mapping template into a file. {pull}4323[4323]

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,7 +51,7 @@ Beats](https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats.
 
 The Beats are Go programs, so install the latest version of
 [golang](http://golang.org/) if you don't have it already. The current Go version
-used for development is Golang 1.8.1.
+used for development is Golang 1.8.3.
 
 The location where you clone is important. Please clone under the source
 directory of your `GOPATH`. If you don't have `GOPATH` already set, you can

diff --git a/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile b/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM tudorg/xgo-deb6-1.8.1
+FROM tudorg/xgo-deb6-1.8.3
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

diff --git a/dev-tools/packer/docker/xgo-image-deb6/build.sh b/dev-tools/packer/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.8.1 go-1.8.1/ &&
+    docker build --rm=true -t tudorg/xgo-deb6-1.8.3 go-1.8.3/ &&
     docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder
diff --git a/...docker/xgo-image-deb6/go-1.8.1/Dockerfile → ...docker/xgo-image-deb6/go-1.8.3/Dockerfile b/...docker/xgo-image-deb6/go-1.8.1/Dockerfile → ...docker/xgo-image-deb6/go-1.8.3/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.8.1 layer
+# Go cross compiler (xgo): Go 1.8.3 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.8.1.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="a433f76c569055ff8536d796995518dd91a9fa5b" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="838c415896ef5ecd395dfabde5e7e6f8ac943c8e" && \
   \
   $BOOTSTRAP_PURE
diff --git a/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile b/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM tudorg/xgo-1.8.1
+FROM tudorg/xgo-1.8.3
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

diff --git a/dev-tools/packer/docker/xgo-image/build.sh b/dev-tools/packer/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.8.1 go-1.8.1/ &&
+    docker build --rm=true -t tudorg/xgo-1.8.3 go-1.8.3/ &&
     docker build --rm=true -t tudorg/beats-builder beats-builder
diff --git a/...cker/docker/xgo-image/go-1.8.1/Dockerfile → ...cker/docker/xgo-image/go-1.8.3/Dockerfile b/...cker/docker/xgo-image/go-1.8.1/Dockerfile → ...cker/docker/xgo-image/go-1.8.3/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.8.1 layer
+# Go cross compiler (xgo): Go 1.8.3 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.8.1.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="a433f76c569055ff8536d796995518dd91a9fa5b" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="838c415896ef5ecd395dfabde5e7e6f8ac943c8e" && \
   \
   $BOOTSTRAP_PURE
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.1
+FROM golang:1.8.3
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
@@ -1,5 +1,5 @@
 # Beats dockerfile used for testing
-FROM golang:1.8.1
+FROM golang:1.8.3
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 6.0.0-alpha1
 :doc-branch: master
-:go-version: 1.8.1
+:go-version: 1.8.3
 :release-state: prerelease
 :python: 2.7.9
 :docker: 1.12

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.1
+FROM golang:1.8.3
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,5 +1,5 @@
 # Tomcat is started to fetch Jolokia metrics from it
-FROM golang:1.8.1
+FROM golang:1.8.3
 
 COPY test/main.go main.go