Update to Golang 1.9.2 (elastic#5569)

Update to Golang 1.9.2
eric4545 · Nov 15, 2017 · 408af58 · 408af58
1 parent 08c92c7
commit 408af58
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 18 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.8.3
+1.9.2
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -92,6 +92,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Add `output.file.permission` config option. {pull}4638[4638]
 - Refactor add_kubernetes_metadata to support autodiscovery {pull}5434[5434]
 - Improve custom flag handling and CLI flags usage message. {pull}5543[5543]
+- Update to Golang 1.9.2
 
 *Auditbeat*
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -61,7 +61,7 @@ mkdir -p ~/bin
 curl -sL -o ~/bin/gvm https://github.com/andrewkroh/gvm/releases/download/v0.0.1/gvm-linux-amd64
 chmod +x ~/bin/gvm
 echo 'export PATH=~/bin:$PATH' >> ~/.bash_profile
-echo 'eval "$(gvm 1.8.3)"' >> ~/.bash_profile
+echo 'eval "$(gvm 1.9.2)"' >> ~/.bash_profile
 SCRIPT
 
 Vagrant.configure(2) do |config|

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.3
+FROM tudorg/xgo-deb6-1.9.2
 
 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.3 go-1.8.3/ &&
+    docker build --rm=true -t tudorg/xgo-deb6-1.9.2 go-1.9.2/ &&
     docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder
diff --git a/...docker/xgo-image-deb6/go-1.8.3/Dockerfile → ...docker/xgo-image-deb6/go-1.9.2/Dockerfile b/...docker/xgo-image-deb6/go-1.8.3/Dockerfile → ...docker/xgo-image-deb6/go-1.9.2/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.8.3 layer
+# Go cross compiler (xgo): Go 1.9.2 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.3.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="838c415896ef5ecd395dfabde5e7e6f8ac943c8e" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="94c889e039e3d2e94ed95e8f8cb747c5bc1c2b58" && \
   \
   $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.3
+FROM tudorg/xgo-1.9.2
 
 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.3 go-1.8.3/ &&
+    docker build --rm=true -t tudorg/xgo-1.9.2 go-1.9.2/ &&
     docker build --rm=true -t tudorg/beats-builder beats-builder
diff --git a/...cker/docker/xgo-image/go-1.8.3/Dockerfile → ...cker/docker/xgo-image/go-1.9.2/Dockerfile b/...cker/docker/xgo-image/go-1.8.3/Dockerfile → ...cker/docker/xgo-image/go-1.9.2/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.8.3 layer
+# Go cross compiler (xgo): Go 1.9.2 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.3.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="838c415896ef5ecd395dfabde5e7e6f8ac943c8e" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="94c889e039e3d2e94ed95e8f8cb747c5bc1c2b58" && \
   \
   $BOOTSTRAP_PURE
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.3
+FROM golang:1.9.2
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \
@@ -7,6 +7,8 @@ RUN set -x && \
          netcat python-pip virtualenv && \
     apt-get clean
 
+RUN pip install --upgrade setuptools
+
 # Setup work environment
 ENV FILEBEAT_PATH /go/src/github.com/elastic/beats/filebeat
 

diff --git a/generator/beat/{beat}/.travis.yml b/generator/beat/{beat}/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - 1.8.3
+  - 1.9.2
 
 os:
   - linux

diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
@@ -1,5 +1,5 @@
 # Beats dockerfile used for testing
-FROM golang:1.8.3
+FROM golang:1.9.2
 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: 7.0.0-alpha1
 :doc-branch: master
-:go-version: 1.8.3
+:go-version: 1.9.2
 :release-state: unreleased
 :python: 2.7.9
 :docker: 1.12

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.3
+FROM golang:1.9.2
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \
@@ -7,6 +7,8 @@ RUN set -x && \
          netcat python-pip virtualenv && \
     apt-get clean
 
+RUN pip install --upgrade setuptools
+
 # Setup work environment
 ENV METRICBEAT_PATH /go/src/github.com/elastic/beats/metricbeat
 

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.3
+FROM golang:1.9.2
 
 COPY test/main.go main.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ services: @@
     language: go
     go:
-      - 1.8.3
+      - 1.9.2
     os:
       - linux
@@ Expand Down @@