From cc63c100e31fd845765d6092f526196ed2c48c73 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:07:29 -0400 Subject: [PATCH] [Automation] Update go release version to 1.17.2 (#28326) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: apmmachine Co-authored-by: Noémi Ványi (cherry picked from commit 27c52d2663ee8a5de843ac5bf8ca0badbe34eb69) # Conflicts: # libbeat/docs/version.asciidoc --- .go-version | 2 +- auditbeat/Dockerfile | 2 +- filebeat/Dockerfile | 2 +- heartbeat/Dockerfile | 2 +- journalbeat/Dockerfile | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 6 ++++++ metricbeat/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/elastic-agent/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/libbeat/Dockerfile | 2 +- 12 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.go-version b/.go-version index 511a76e6faf..06fb41b6322 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.17.1 +1.17.2 diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 50975c2e0a1..ceccec4026d 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 13836b19c51..b4db2123456 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 1d2bab491cc..0108b788c35 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/journalbeat/Dockerfile b/journalbeat/Dockerfile index 354718af081..6c461fcb01a 100644 --- a/journalbeat/Dockerfile +++ b/journalbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index fe9b4e01a2c..e02f709d191 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index e9a9c60bf38..b8a26e124e7 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,12 @@ +<<<<<<< HEAD :stack-version: 7.16.0 :doc-branch: 7.x :go-version: 1.17.1 +======= +:stack-version: 8.0.0 +:doc-branch: master +:go-version: 1.17.2 +>>>>>>> 27c52d2663 ([Automation] Update go release version to 1.17.2 (#28326)) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index b6498ffcd6c..a283f4928ae 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 4d5ad764b67..d7d9ed89fe6 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/x-pack/elastic-agent/Dockerfile b/x-pack/elastic-agent/Dockerfile index 59d234d6713..5b2e9d84586 100644 --- a/x-pack/elastic-agent/Dockerfile +++ b/x-pack/elastic-agent/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.17.1 +ARG GO_VERSION=1.17.2 FROM circleci/golang:${GO_VERSION} diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 32a50093bae..70d7f46a2cd 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \ diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile index 47e632241d9..2c51fb632b2 100644 --- a/x-pack/libbeat/Dockerfile +++ b/x-pack/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1 +FROM golang:1.17.2 RUN \ apt-get update \