Update Golang to 1.15.12 (#25629)

(cherry picked from commit fd13dc5) # Conflicts: # libbeat/docs/version.asciidoc
elastic · May 10, 2021 · 8bb8542 · 8bb8542
1 parent 035664e
commit 8bb8542
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 :stack-version: 7.13.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-FROM golang:1.15.10
+FROM golang:1.15.12
 
 RUN \
     apt-get update \