From 6918f05eb38571723a5f0e4285520c073b5dad7a Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Tue, 18 Apr 2017 09:46:51 +0200 Subject: [PATCH] Update Go version to 1.8.1 Includes: * packer docker images * travis & appveoyor * Dockerfiles --- .appveyor.yml | 2 +- .travis.yml | 2 +- CHANGELOG.asciidoc | 1 + .../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.7.4 => go-1.8.1}/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.7.4 => go-1.8.1}/Dockerfile | 6 +++--- filebeat/Dockerfile | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- 13 files changed, 17 insertions(+), 16 deletions(-) rename dev-tools/packer/docker/xgo-image-deb6/{go-1.7.4 => go-1.8.1}/Dockerfile (56%) rename dev-tools/packer/docker/xgo-image/{go-1.7.4 => go-1.8.1}/Dockerfile (55%) diff --git a/.appveyor.yml b/.appveyor.yml index be0cf377f42..8fd0575e1c0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,7 +7,7 @@ os: Windows Server 2012 R2 # Environment variables environment: GOPATH: c:\gopath - GVM_GO_VERSION: 1.7.4 + GVM_GO_VERSION: 1.8.1 GVM_DL: https://github.com/andrewkroh/gvm/releases/download/v0.0.1/gvm-windows-amd64.exe PYWIN_DL: https://beats-files.s3.amazonaws.com/deps/pywin32-220.win32-py2.7.exe matrix: diff --git a/.travis.yml b/.travis.yml index 90e2894cc9a..cdde4f231bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # Cross-compile for amd64 only to speed up testing. - GOX_FLAGS="-arch amd64" - DOCKER_COMPOSE_VERSION: 1.11.1 - - &go_version 1.7.4 + - &go_version 1.8.1 matrix: include: diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 86ac40c3a18..b4b7af21b9e 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -94,6 +94,7 @@ https://github.com/elastic/beats/compare/v5.1.1...master[Check the HEAD diff] - Initialize a beats UUID from file on startup. {pull}3615[3615] - Add new `add_locale` processor to export the local timezone with an event. {pull}3902[3902] - Add http endpoint. {pull}3717[3717] +- Updated to Go 1.8.1. {pull}4033[4033] *Filebeat* 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 21b22864738..4e2e36c7740 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.7.4 +FROM tudorg/xgo-deb6-1.8.1 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 df68d8af68a..21317a98872 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.7.4 go-1.7.4/ && + docker build --rm=true -t tudorg/xgo-deb6-1.8.1 go-1.8.1/ && docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder diff --git a/dev-tools/packer/docker/xgo-image-deb6/go-1.7.4/Dockerfile b/dev-tools/packer/docker/xgo-image-deb6/go-1.8.1/Dockerfile similarity index 56% rename from dev-tools/packer/docker/xgo-image-deb6/go-1.7.4/Dockerfile rename to dev-tools/packer/docker/xgo-image-deb6/go-1.8.1/Dockerfile index 075478f5188..cedbdc4f30c 100644 --- a/dev-tools/packer/docker/xgo-image-deb6/go-1.7.4/Dockerfile +++ b/dev-tools/packer/docker/xgo-image-deb6/go-1.8.1/Dockerfile @@ -1,4 +1,4 @@ -# Go cross compiler (xgo): Go 1.7.4 layer +# Go cross compiler (xgo): Go 1.8.1 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.7.4.linux-amd64.tar.gz" && \ - export ROOT_DIST_SHA1="2e5baf03d1590e048c84d1d5b4b6f2540efaaea1" && \ + export ROOT_DIST="https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz" && \ + export ROOT_DIST_SHA1="a433f76c569055ff8536d796995518dd91a9fa5b" && \ \ $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 c13f1c049a2..31e485d5d87 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.7.4 +FROM tudorg/xgo-1.8.1 MAINTAINER Tudor Golubenco diff --git a/dev-tools/packer/docker/xgo-image/build.sh b/dev-tools/packer/docker/xgo-image/build.sh index 6c70b8208f4..8414d4ab566 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.7.4 go-1.7.4/ && + docker build --rm=true -t tudorg/xgo-1.8.1 go-1.8.1/ && docker build --rm=true -t tudorg/beats-builder beats-builder diff --git a/dev-tools/packer/docker/xgo-image/go-1.7.4/Dockerfile b/dev-tools/packer/docker/xgo-image/go-1.8.1/Dockerfile similarity index 55% rename from dev-tools/packer/docker/xgo-image/go-1.7.4/Dockerfile rename to dev-tools/packer/docker/xgo-image/go-1.8.1/Dockerfile index 4f19a0959c9..005a4beb702 100644 --- a/dev-tools/packer/docker/xgo-image/go-1.7.4/Dockerfile +++ b/dev-tools/packer/docker/xgo-image/go-1.8.1/Dockerfile @@ -1,4 +1,4 @@ -# Go cross compiler (xgo): Go 1.7.4 layer +# Go cross compiler (xgo): Go 1.8.1 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.7.4.linux-amd64.tar.gz" && \ - export ROOT_DIST_SHA1="2e5baf03d1590e048c84d1d5b4b6f2540efaaea1" && \ + export ROOT_DIST="https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz" && \ + export ROOT_DIST_SHA1="a433f76c569055ff8536d796995518dd91a9fa5b" && \ \ $BOOTSTRAP_PURE diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 0cb92d48aec..3ea343f0bbd 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.4 +FROM golang:1.8.1 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index 00f00464696..bd5fcb308b1 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,5 +1,5 @@ # Beats dockerfile used for testing -FROM golang:1.7.4 +FROM golang:1.8.1 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index e63a7c7873c..0dad4939f78 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,4 +1,4 @@ :stack-version: 6.0.0-alpha1 :doc-branch: master -:go-version: 1.7.4 +:go-version: 1.8.1 :release-state: unreleased diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 9de791219e2..c23a651428b 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.4 +FROM golang:1.8.1 MAINTAINER Nicolas Ruflin RUN set -x && \