From 48dba593e0ade8ef811be64ca39420043fd46eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Mon, 10 May 2021 17:13:04 +0200 Subject: [PATCH] Update Golang to 1.15.12 (#25629) (cherry picked from commit fd13dc5e0dbf796f8a9fc82566c5f6acb994a3ba) # Conflicts: # libbeat/docs/version.asciidoc --- .go-version | 2 +- CHANGELOG-developer.next.asciidoc | 1 + auditbeat/Dockerfile | 2 +- filebeat/Dockerfile | 2 +- heartbeat/Dockerfile | 2 +- journalbeat/Dockerfile | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 6 ++++++ metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/libbeat/Dockerfile | 2 +- 13 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.go-version b/.go-version index 30a88ea45a4..50830c83cca 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.15.9 +1.15.12 diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index 77ab2c75797..a471b4e2b18 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -104,3 +104,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Update Go version to 1.15.8. {pull}23955[23955] - Update Go version to 1.15.9. {pull}24442[24442] - Update Go version to 1.15.10. {pull}24606[24606] +- Update Go version to 1.15.12. {pull}25629[25629] diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 54df8f43190..b2a882a0300 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 1e8fd395a95..0c3b36d9a39 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 8f2739234e3..00f5e50d404 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/journalbeat/Dockerfile b/journalbeat/Dockerfile index ab9e7a4c3eb..350b3fd32f9 100644 --- a/journalbeat/Dockerfile +++ b/journalbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index df8ab228c5e..41e789be773 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 738d7d5c145..56471a72827 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,12 @@ +<<<<<<< HEAD :stack-version: 7.11.0 :doc-branch: 7.x :go-version: 1.15.10 +======= +:stack-version: 8.0.0 +:doc-branch: master +:go-version: 1.15.12 +>>>>>>> fd13dc5e0d... Update Golang to 1.15.12 (#25629) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index ce2288750fb..1043ad79117 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index fdda93f7765..f0c643747ee 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 COPY test/main.go main.go diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index fa09b50a228..54f2cbdcb31 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 7f043ffad55..d6b831f8e1b 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \ diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile index 17810925ee0..c40480d08a5 100644 --- a/x-pack/libbeat/Dockerfile +++ b/x-pack/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.10 +FROM golang:1.15.12 RUN \ apt-get update \