From 408af589f814ef378d6aa469660ebc813026cf24 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Thu, 16 Nov 2017 00:54:56 +1100 Subject: [PATCH] Update to Golang 1.9.2 (#5569) Update to Golang 1.9.2 --- .go-version | 2 +- CHANGELOG.asciidoc | 1 + Vagrantfile | 2 +- .../packer/docker/xgo-image-deb6/beats-builder/Dockerfile | 2 +- dev-tools/packer/docker/xgo-image-deb6/build.sh | 2 +- .../docker/xgo-image-deb6/{go-1.8.3 => go-1.9.2}/Dockerfile | 6 +++--- dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile | 2 +- dev-tools/packer/docker/xgo-image/build.sh | 2 +- .../docker/xgo-image/{go-1.8.3 => go-1.9.2}/Dockerfile | 6 +++--- filebeat/Dockerfile | 4 +++- generator/beat/{beat}/.travis.yml | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 4 +++- metricbeat/module/http/_meta/Dockerfile | 2 +- 15 files changed, 23 insertions(+), 18 deletions(-) rename dev-tools/packer/docker/xgo-image-deb6/{go-1.8.3 => go-1.9.2}/Dockerfile (56%) rename dev-tools/packer/docker/xgo-image/{go-1.8.3 => go-1.9.2}/Dockerfile (55%) diff --git a/.go-version b/.go-version index a7ee35a3ea70..8fdcf3869464 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.8.3 +1.9.2 diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index cde9838209a9..d68f9989ae91 100644 --- 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 index 86da498e6c0f..5a6950ffaf01 100644 --- 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 index 86a10029e18a..87be67de9ef3 100644 --- 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 diff --git a/dev-tools/packer/docker/xgo-image-deb6/build.sh b/dev-tools/packer/docker/xgo-image-deb6/build.sh index c6ff338de2f1..4d266530346b 100755 --- 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/dev-tools/packer/docker/xgo-image-deb6/go-1.8.3/Dockerfile b/dev-tools/packer/docker/xgo-image-deb6/go-1.9.2/Dockerfile similarity index 56% rename from dev-tools/packer/docker/xgo-image-deb6/go-1.8.3/Dockerfile rename to dev-tools/packer/docker/xgo-image-deb6/go-1.9.2/Dockerfile index 55dcc281bf2c..915a304ac47f 100644 --- a/dev-tools/packer/docker/xgo-image-deb6/go-1.8.3/Dockerfile +++ b/dev-tools/packer/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 # 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 index 81c4bf584321..c1623d76d4ff 100644 --- 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 diff --git a/dev-tools/packer/docker/xgo-image/build.sh b/dev-tools/packer/docker/xgo-image/build.sh index 33f76471d793..ac6c4e715787 100755 --- 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/dev-tools/packer/docker/xgo-image/go-1.8.3/Dockerfile b/dev-tools/packer/docker/xgo-image/go-1.9.2/Dockerfile similarity index 55% rename from dev-tools/packer/docker/xgo-image/go-1.8.3/Dockerfile rename to dev-tools/packer/docker/xgo-image/go-1.9.2/Dockerfile index 910878598ba2..28a602542975 100644 --- a/dev-tools/packer/docker/xgo-image/go-1.8.3/Dockerfile +++ b/dev-tools/packer/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 # 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 index 477bd0c8772b..b5557a4f64a0 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.3 +FROM golang:1.9.2 MAINTAINER Nicolas Ruflin 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 index 94d70a600498..30a200056589 100644 --- 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 index 24413143b216..9b45ebbf5f38 100644 --- 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 RUN set -x && \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index f3372a2a699d..30d774ab1308 100644 --- 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 index d9c6b797a63d..8a1fad093c44 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.3 +FROM golang:1.9.2 MAINTAINER Nicolas Ruflin 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 index 04af0641f0e0..3cb268505dbf 100644 --- 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